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

package/src/concepts/NewList__.ts

@@ -54,7 +54,7 @@ export class NewList extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 成员表达式

package/src/concepts/NewMap__.ts

@@ -54,7 +54,7 @@ export class NewMap extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 键
@@ -680,12 +680,17 @@ export class NewMap extends LogicItem {
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
     const typeAnnotation =
-      this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS(shiftState(state, code, { inline: true })))?.join(', ') || '__IDENTIFIER__';
+      this?.typeAnnotation?.typeArguments
+        ?.map((item) => item?.toNaturalTS(shiftState(state, code, { inline: true })))
+        ?.join(', ') || '__IDENTIFIER__';
     let params = '';
     this?.keys?.forEach((item, index) => {
       if (item) {
-        const key = item?.toNaturalTS(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) || '__IDENTIFIER__';
-        params += `${item?.concept.endsWith('Literal') ? key : `[${key}]`}: ${this?.values?.[index]?.toNaturalTS(shiftState(state, code, { inline: true }))}`;
+        const key =
+          item?.toNaturalTS(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) || '__IDENTIFIER__';
+        params += `${item?.concept.endsWith('Literal') ? key : `[${key}]`}: ${this?.values?.[index]?.toNaturalTS(
+          shiftState(state, code, { inline: true }),
+        )}`;
         if (index !== this.keys.length - 1) {
           params += ', ';
         }
@@ -702,8 +707,12 @@ export class NewMap extends LogicItem {
     let paramStr = '';
     this?.keys?.forEach((item, index) => {
       if (item) {
-        const key = item?.toTextualNASL(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) || '__IDENTIFIER__';
-        paramStr += `${item?.concept.endsWith('Literal') ? key : `[${key}]`} -> ${this?.values?.[index]?.toTextualNASL(shiftState(state, code, { inline: true }))}`;
+        const key =
+          item?.toTextualNASL(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) ||
+          '__IDENTIFIER__';
+        paramStr += `${item?.concept.endsWith('Literal') ? key : `[${key}]`} -> ${this?.values?.[index]?.toTextualNASL(
+          shiftState(state, code, { inline: true }),
+        )}`;
         if (index !== this.keys.length - 1) {
           paramStr += ', ';
         }

package/src/concepts/NumberInputSetter__.ts

@@ -36,42 +36,32 @@ export class NumberInputSetter extends BaseSetter {
   /**
    * 按钮位置
    */
-  @property({
-    objectRef: '',
-  })
-  placement?: string = null;
+  @property()
+  placement?: string;
 
   /**
    * 最小值
    */
-  @property({
-    objectRef: '',
-  })
-  min?: number = null;
+  @property()
+  min?: number;
 
   /**
    * 最大值
    */
-  @property({
-    objectRef: '',
-  })
-  max?: number = null;
+  @property()
+  max?: number;
 
   /**
    * 精度
    */
-  @property({
-    objectRef: '',
-  })
-  precision?: number = null;
+  @property()
+  precision?: number;
 
   /**
    * 占位文本
    */
-  @property({
-    objectRef: '',
-  })
-  placeholder?: string = null;
+  @property()
+  placeholder?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/NumericLiteral__.ts

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

package/src/concepts/OperatePermissionV2__.ts

@@ -44,33 +44,25 @@ export class OperatePermissionV2 extends BaseNode {
   /**
    * 字段名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: 'approve' | 'reject' | 'reassign' | 'revert' | 'submit' | 'withdraw';
 
   /**
    * 是否允许操作
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   operationEnabled: boolean;
 
   /**
    * 操作显示文本
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   displayText: string;
 
   /**
    * 意见是否必填
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   commentRequired: boolean;
 
   /**

package/src/concepts/OqlQueryComponent__.ts

@@ -56,9 +56,7 @@ export class OqlQueryComponent extends LogicItem {
   /**
    * SQL 查询
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**
@@ -67,14 +65,12 @@ export class OqlQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 数据源
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   dataSource: string;
 
   /**

package/src/concepts/OverriddenLogic__.ts

@@ -84,41 +84,31 @@ export class OverriddenLogic extends BaseNode {
   /**
    * 覆写的模块
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   overriddenModule: string;
 
   /**
    * 覆写逻辑名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 覆写逻辑描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
    * 触发方式
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   triggerType: string;
 
   /**
    * 定时任务表达式
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   cron: string;
 
   /**
@@ -137,7 +127,7 @@ export class OverriddenLogic extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeParams?: Array<TypeParam> = null;
+  typeParams?: Array<TypeParam>;
 
   /**
    * 输入参数列表
@@ -1596,14 +1586,13 @@ export class OverriddenLogic extends BaseNode {
     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(
@@ -1632,7 +1621,7 @@ export class OverriddenLogic extends BaseNode {
               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,
             );
@@ -1690,7 +1679,7 @@ export class OverriddenLogic extends BaseNode {
             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
@@ -1885,7 +1874,8 @@ export class OverriddenLogic extends BaseNode {
       });
 
       if (!this.body.length || this.body.length === 2) {
-        if (`${this.nodePath}.body[1]` === state.focusedNodePath) code += `${indent(state.tabSize + 1)}/* 当前位置 */\n`;
+        if (`${this.nodePath}.body[1]` === state.focusedNodePath)
+          code += `${indent(state.tabSize + 1)}/* 当前位置 */\n`;
         code += `${indent(state.tabSize + 1)}return ${this.returns[0].name};\n`;
       } else {
         this.body.forEach((item) => {
@@ -1934,7 +1924,7 @@ export class OverriddenLogic extends BaseNode {
     });
     code += ')';
 
-    if(this.returns.length) {
+    if (this.returns.length) {
       code += ' => ';
       this.returns.forEach((ret) => {
         code += ret.toTextualNASL(shiftState(state, code, { inline: true }));

package/src/concepts/ParamWithGroup__.ts

@@ -47,17 +47,13 @@ export class ParamWithGroup extends Param {
   /**
    * 标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 分组
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   group: string;
 
   /**

package/src/concepts/Param__.ts

@@ -71,18 +71,14 @@ export class Param extends BaseNode {
   /**
    * 输入参数名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 输入参数描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * 类型
@@ -90,7 +86,7 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 默认值
@@ -98,7 +94,7 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue?: DefaultValue = null;
+  defaultValue?: DefaultValue;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/Point__.ts

@@ -35,17 +35,13 @@ export class Point extends BaseNode {
   /**
    * x
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   x: number;
 
   /**
    * y
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   y: number;
 
   /**

package/src/concepts/ProcessBindV2__.ts

@@ -45,17 +45,13 @@ export class ProcessBindV2 extends BaseNode {
   /**
    * 引用数据结构或实体的命名空间
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   refNamespace: string;
 
   /**
    * 引用数据结构或实体的名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   refName: string;
 
   /**

package/src/concepts/ProcessComponent__.ts

@@ -38,33 +38,25 @@ export class ProcessComponent extends BaseNode {
   /**
    * 流程组件名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 流程组件标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 流程组件描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
    * category
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   category: string;
 
   /**

package/src/concepts/ProcessElementV2__.ts

@@ -68,33 +68,25 @@ export class ProcessElementV2 extends BaseNode {
   /**
    * 流程元素名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 流程元素标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 流程元素描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
    * type
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type:
     | 'StartNoneEvent'
     | 'EndNoneEvent'
@@ -110,17 +102,13 @@ export class ProcessElementV2 extends BaseNode {
   /**
    * 源节点
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   sourceRef: string;
 
   /**
    * 目标节点
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   targetRef: string;
 
   /**
@@ -182,17 +170,13 @@ export class ProcessElementV2 extends BaseNode {
   /**
    * 条件流的优先级
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   flowPriority: number;
 
   /**
    * 任务实例标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   taskTitle: string;
 
   /**
@@ -1503,7 +1487,7 @@ export class ProcessElementV2 extends BaseNode {
           .concat(afterLinks)
           .map((l) => `'${l.name}'`)
           .join(',')})\n`;
-      } else if(self.type === 'ExclusiveGateway') {
+      } else if (self.type === 'ExclusiveGateway') {
         code += `${tab1}nasl.processV2.atLeastTwoOutcomeFlow(${afterLinks.map((l) => `'${l.name}'`).join(',')})\n`;
       }
       code += '},\n';
@@ -1520,8 +1504,8 @@ export class ProcessElementV2 extends BaseNode {
         yield* wrapForEach(self.flowCondition.items, function* warpForEachGenerator(BinaryExpression) {
           // 日期格式的判断先过滤掉，因为日期格式是string类型，判断永远是失败的
           const value = (BinaryExpression?.right as any)?.value;
-          if(dateTimeRegex.test(value) || timeRegex.test(value)) {
-            return ;
+          if (dateTimeRegex.test(value) || timeRegex.test(value)) {
+            return;
           }
           code += `${yield* BinaryExpression.toEmbeddedTS(
             shiftState(state, code, {

package/src/concepts/ProcessElement__.ts

@@ -66,25 +66,19 @@ export class ProcessElement extends BaseNode {
   /**
    * 流程元素名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 流程元素标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 流程元素描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -100,25 +94,19 @@ export class ProcessElement extends BaseNode {
   /**
    * type
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: string;
 
   /**
    * sourceRef
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   sourceRef: string;
 
   /**
    * targetRef
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   targetRef: string;
 
   /**
@@ -142,9 +130,7 @@ export class ProcessElement extends BaseNode {
   /**
    * flowValue
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   flowValue: string;
 
   /**
@@ -1642,12 +1628,16 @@ export class ProcessElement extends BaseNode {
       code += '_constraints: function() {\n';
       code += `${tab1}nasl.process.atLeastOneOutcomeFlow(${afterLinks.map((l) => `'${l.name}'`).join(',')})\n`;
       code += `${tab1}nasl.process.atLeastOneOutcomeFlow(${beforeLinks.map((l) => `'${l.name}'`).join(',')})\n`;
-      if (['ParallelGateway', 'InclusiveGateway'].includes(self.type) && afterLinks.length > 0 && beforeLinks.length > 0) {
+      if (
+        ['ParallelGateway', 'InclusiveGateway'].includes(self.type) &&
+        afterLinks.length > 0 &&
+        beforeLinks.length > 0
+      ) {
         code += `${tab1}nasl.process.atLeastThreeOutcomeFlow(${beforeLinks
           .concat(afterLinks)
           .map((l) => `'${l.name}'`)
           .join(',')})\n`;
-      } else if(self.type === 'ExclusiveGateway') {
+      } else if (self.type === 'ExclusiveGateway') {
         code += `${tab1}nasl.process.atLeastTwoOutcomeFlow(${afterLinks.map((l) => `'${l.name}'`).join(',')})\n`;
       }
       code += '},\n';

package/src/concepts/ProcessOutcome__.ts

@@ -47,9 +47,7 @@ export class ProcessOutcome extends LogicItem {
   /**
    * 关联连接器
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   flowRef: string;
 
   /**

package/src/concepts/ProcessOutcomes__.ts

@@ -47,7 +47,6 @@ export class ProcessOutcomes extends LogicItem {
    * 关联连接器
    */
   @property({
-    objectRef: '',
     isArray: true,
     defaultValue: [],
   })