@lcap/nasl 3.4.0-alpha.2 → 3.4.0-beta.1

package/src/concepts/AssignmentLine__.ts

@@ -29,13 +29,17 @@ export class AssignmentLine extends BaseNode {
   /**
    * 左侧索引
    */
-  @property()
+  @property({
+    isArray: true,
+  })
   leftIndex: Array<number> = [];
 
   /**
    * 右侧索引
    */
-  @property()
+  @property({
+    isArray: true,
+  })
   rightIndex: Array<number> = [];
 
   /**

package/src/concepts/Assignment__.ts

@@ -43,14 +43,18 @@ export class Assignment extends LogicItem {
   /**
    * 左边项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   left!: LogicItem;
 
   /**
    * 右边项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   right!: LogicItem;
 

package/src/concepts/Attribute__.ts

@@ -60,7 +60,9 @@ export class Attribute extends BaseNode {
   /**
    * 类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
   // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 

package/src/concepts/AuthLogicForCallInterface__.ts

@@ -49,7 +49,10 @@ export class AuthLogicForCallInterface extends AuthLogic {
   /**
    * 鉴权配置参数, 调用接口鉴权独有
    */
-  @property('Param')
+  @property({
+    objectRef: 'Param',
+    isArray: true,
+  })
   authParams: Array<Param> = [];
 
   /**

package/src/concepts/AuthLogic__.ts

@@ -5,6 +5,9 @@
 import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
 import Module from './Module__';
 import View from './View__';
 import ProcessElement from './ProcessElement__';

package/src/concepts/BackendVariable__.ts

@@ -65,7 +65,9 @@ export class BackendVariable extends BaseNode {
   /**
    * 类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
   // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 

package/src/concepts/Backend__.ts

@@ -40,7 +40,10 @@ export class Backend extends BaseNode {
   /**
    * 后端全局变量列表
    */
-  @property('BackendVariable')
+  @property({
+    objectRef: 'BackendVariable',
+    isArray: true,
+  })
   variables: Array<BackendVariable> = [];
 
   /**

package/src/concepts/BatchAssignment__.ts

@@ -42,20 +42,28 @@ export class BatchAssignment extends LogicItem {
   /**
    * 左边项
    */
-  @property('SelectMembers')
+  @property({
+    objectRef: 'SelectMembers',
+  })
   // @ts-ignore
   left!: SelectMembers;
 
   /**
    * 右边项
    */
-  @property('SelectMembers')
+  @property({
+    objectRef: 'SelectMembers',
+    isArray: true,
+  })
   rights: Array<SelectMembers> = [];
 
   /**
    * 赋值
    */
-  @property('AssignmentLine')
+  @property({
+    objectRef: 'AssignmentLine',
+    isArray: true,
+  })
   assignmentLines: Array<AssignmentLine> = [];
 
   /**

package/src/concepts/BinaryExpression__.ts

@@ -48,14 +48,18 @@ export class BinaryExpression extends LogicItem {
   /**
    * 左边项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   left!: LogicItem;
 
   /**
    * 右边项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   right!: LogicItem;
 

package/src/concepts/BindAttribute__.ts

@@ -25,7 +25,6 @@ import Module from './Module__';
 import App from './App__';
 import Frontend from './Frontend__';
 import Process from './Process__';
-import Identifier from './Identifier__';
 
 /**
  * 元素绑定属性
@@ -67,34 +66,45 @@ export class BindAttribute extends BaseNode {
   /**
    * 属性表达式
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   expression!: LogicItem;
 
   /**
    * 跳转页面
    */
-  @property('Destination')
+  @property({
+    objectRef: 'Destination',
+  })
   // @ts-ignore
   destination!: Destination;
 
   /**
    * 跳转页面
    */
-  @property('ExternalDestination')
+  @property({
+    objectRef: 'ExternalDestination',
+  })
   // @ts-ignore
   externalDestination!: ExternalDestination;
 
   /**
    * 验证规则
    */
-  @property('ValidationRule')
+  @property({
+    objectRef: 'ValidationRule',
+    isArray: true,
+  })
   rules: Array<ValidationRule> = [];
 
   /**
    * 经办人
    */
-  @property('Assignee')
+  @property({
+    objectRef: 'Assignee',
+  })
   // @ts-ignore
   assignee!: Assignee;
 
@@ -115,7 +125,10 @@ export class BindAttribute extends BaseNode {
   /**
    * 草稿态
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   playground: Array<LogicItem> = [];
 
   /**

package/src/concepts/BindDirective__.ts

@@ -65,7 +65,9 @@ export class BindDirective extends BaseNode {
   /**
    * 属性表达式
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   expression!: LogicItem;
 
@@ -86,7 +88,10 @@ export class BindDirective extends BaseNode {
   /**
    * 草稿态
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   playground: Array<LogicItem> = [];
 
   /**

package/src/concepts/BindEvent__.ts

@@ -51,7 +51,10 @@ export class BindEvent extends BaseNode {
   /**
    * 逻辑列表
    */
-  @property('Logic')
+  @property({
+    objectRef: 'Logic',
+    isArray: true,
+  })
   logics: Array<Logic> = [];
 
   /**
@@ -71,7 +74,10 @@ export class BindEvent extends BaseNode {
   /**
    * 实际参数
    */
-  @property('Argument')
+  @property({
+    objectRef: 'Argument',
+    isArray: true,
+  })
   arguments: Array<Argument> = [];
 
   /**

package/src/concepts/BindStyle__.ts

@@ -44,14 +44,19 @@ export class BindStyle extends BaseNode {
   /**
    * 属性表达式
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   expression!: LogicItem;
 
   /**
    * 草稿态
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   playground: Array<LogicItem> = [];
 
   /**

package/src/concepts/CallAuthInterface__.ts

@@ -36,7 +36,10 @@ export class CallAuthInterface extends CallInterface {
   /**
    * 鉴权逻辑所需参数
    */
-  @property('Argument')
+  @property({
+    objectRef: 'Argument',
+    isArray: true,
+  })
   authArguments: Array<Argument> = [];
 
   /**

package/src/concepts/CallFunction__.ts

@@ -67,13 +67,19 @@ export class CallFunction extends LogicItem {
   /**
    * 类型参数
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+    isArray: true,
+  })
   typeArguments?: Array<TypeAnnotation> = null;
 
   /**
    * 实际参数
    */
-  @property('Argument')
+  @property({
+    objectRef: 'Argument',
+    isArray: true,
+  })
   arguments: Array<Argument> = [];
 
   /**

package/src/concepts/CallInterface__.ts

@@ -8,6 +8,7 @@ import Module from './Module__';
 import AuthInterface from './AuthInterface__';
 import type { MemberExpression } from './MemberExpression__';
 import Frontend from './Frontend__';
+import type Connector from './Connector__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -67,7 +68,10 @@ export class CallInterface extends LogicItem {
   /**
    * 实际参数
    */
-  @property('Argument')
+  @property({
+    objectRef: 'Argument',
+    isArray: true,
+  })
   arguments: Array<Argument> = [];
 
   /**
@@ -329,8 +333,20 @@ export class CallInterface extends LogicItem {
   toJS(state?: TranslatorState): string {
     const { calleewholeKey, app, completeArguments } = this;
     const [, _name, , _interfaceName] = calleewholeKey.split('.');
-    const _module = app?.interfaceDependencies?.find?.((item) => item.name === _name);
-    const _interface = _module?.interfaces?.find?.((item) => item.name === _interfaceName);
+    let _module: Module | Connector;
+    // 由于自定义连接器的引入，目前在 集成中心下也存在着一部分接口
+    // 因此，需要额外判断，如果是自定义连接器需要拿 app.dependencies 中的接口或者 app.integration 中connector下面的接口
+    const isCustomConnector = this.getAncestor('Connector');
+    const isInIntegration = this.getAncestor('Integration');
+    if (isCustomConnector && isInIntegration) {
+      _module = app?.integration?.connectors?.find?.((item) => item.name === _name);
+    } else if (isCustomConnector && !isInIntegration) {
+      _module = app?.dependencies?.find?.((item) => item.name === _name);
+    } else {
+      // default 
+      _module = app?.interfaceDependencies?.find?.((item) => item.name === _name);
+    }
+    const _interface = (_module as Module)?.interfaces?.find?.((item) => item.name === _interfaceName);
     if (!_interface) {
       if (!this.calleeNamespace || !this.calleeName) throw new Error('调用接口为空');
       throw new Error(`${_name}下的${_interfaceName}接口未找到`);
@@ -594,17 +610,24 @@ export class CallInterface extends LogicItem {
   setCallee(_interface: Interface) {
     const calleeNamespace = _interface.getNamespace();
     const calleeName = _interface.name;
-    const params = this.arguments.map((argumentNode) => {
-      const newParam = _interface.params.find((item) => item.name === argumentNode.keyword)
-      if (newParam) {
-        const argument = Argument.from({
-          keyword: newParam.name,
-          expression: argumentNode.expression
-        }, this, 'arguments');
-        return argument;
+    const params = _interface.params.map((param) => {
+      const oldArgument = this.arguments.find((node) => node.keyword === param.name)
+      return Argument.from({
+        keyword: param.name,
+        expression: oldArgument ? oldArgument.expression : undefined
+      }, this, 'arguments');
+    });
+    const oldArguments = this.arguments.reduce((res, argumentNode) => {
+      const targetParam = _interface.params.find((item) => item.name === argumentNode.keyword)
+      if (!targetParam) {
+        res.push(Argument.from({
+          keyword: argumentNode.keyword,
+          expression: argumentNode ? argumentNode.expression : undefined
+        }, this, 'arguments'))
       }
-      return argumentNode
-    })
+      return res
+    }, [])
+    params.push(...oldArguments)
 
     if (this.app) {
       this.app.emit('collect:start', {
@@ -695,7 +718,19 @@ export class CallInterface extends LogicItem {
     const _arr = this.calleewholeKey.split('.');
     const _name = _arr[1];
     const _interfaceName = _arr[3];
-    const _module = this.app.interfaceDependencies.find((item) => item.name === _name);
+    let _module: Module | Connector;
+    // 由于自定义连接器的引入，目前在 集成中心下也存在着一部分接口
+    // 因此，需要额外判断，如果是自定义连接器需要拿 app.dependencies 中的接口或者 app.integration 中connector下面的接口
+    const isCustomConnector = this.getAncestor('Connector');
+    const isInIntegration = this.getAncestor('Integration');
+    if (isCustomConnector && isInIntegration) {
+      _module = this.app?.integration?.connectors?.find?.((item) => item.name === _name);
+    } else if (isCustomConnector && !isInIntegration) {
+      _module = this.app?.dependencies?.find?.((item) => item.name === _name);
+    } else {
+      // default 
+      _module = this.app.interfaceDependencies.find((item) => item.name === _name);
+    }
     const _interface = _module?.interfaces.find((item) => item.name === _interfaceName);
     return {
       _module,

package/src/concepts/CallLogic__.ts

@@ -85,19 +85,27 @@ export class CallLogic extends LogicItem {
   /**
    * 类型参数
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+    isArray: true,
+  })
   typeArguments?: Array<TypeAnnotation> = null;
 
   /**
    * 实际参数
    */
-  @property('Argument')
+  @property({
+    objectRef: 'Argument',
+    isArray: true,
+  })
   arguments: Array<Argument> = [];
 
   /**
    * 验证规则
    */
-  @property('BindAttribute')
+  @property({
+    objectRef: 'BindAttribute',
+  })
   // @ts-ignore
   validation!: BindAttribute;
 

package/src/concepts/CallQueryComponent__.ts

@@ -44,66 +44,90 @@ export class CallQueryComponent extends LogicItem {
   /**
    * 类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
   // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * select
    */
-  @property('QuerySelectExpression')
+  @property({
+    objectRef: 'QuerySelectExpression',
+  })
   // @ts-ignore
   select!: QuerySelectExpression;
 
   /**
    * from
    */
-  @property('QueryFromExpression')
+  @property({
+    objectRef: 'QueryFromExpression',
+  })
   // @ts-ignore
   from!: QueryFromExpression;
 
   /**
    * where
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   where!: LogicItem;
 
   /**
    * where 草稿态
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   wherePlayground: Array<LogicItem> = [];
 
   /**
    * groupBy
    */
-  @property('QueryGroupByExpression')
+  @property({
+    objectRef: 'QueryGroupByExpression',
+    isArray: true,
+  })
   groupBy: Array<QueryGroupByExpression> = [];
 
   /**
    * having
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   having!: LogicItem;
 
   /**
    * having 草稿态
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   havingPlayground: Array<LogicItem> = [];
 
   /**
    * orderBy
    */
-  @property('QueryOrderByExpression')
+  @property({
+    objectRef: 'QueryOrderByExpression',
+    isArray: true,
+  })
   orderBy: Array<QueryOrderByExpression> = [];
 
   /**
    * limit
    */
-  @property('QueryLimitExpression')
+  @property({
+    objectRef: 'QueryLimitExpression',
+  })
   // @ts-ignore
   limit!: QueryLimitExpression;
 

package/src/concepts/CompletionProperty__.ts

@@ -58,7 +58,9 @@ export class CompletionProperty extends BaseNode {
   /**
    * 类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
   // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 

package/src/concepts/ConfigGroup__.ts

@@ -39,7 +39,10 @@ export class ConfigGroup extends BaseNode {
   /**
    * 配置属性列表
    */
-  @property('ConfigProperty')
+  @property({
+    objectRef: 'ConfigProperty',
+    isArray: true,
+  })
   properties: Array<ConfigProperty> = [];
 
   /**

package/src/concepts/ConfigProperty__.ts

@@ -50,7 +50,10 @@ export class ConfigProperty extends BaseNode {
   /**
    * 配置属性值列表
    */
-  @property('ConfigPropertyValue')
+  @property({
+    objectRef: 'ConfigPropertyValue',
+    isArray: true,
+  })
   values: Array<ConfigPropertyValue> = [];
 
   /**

package/src/concepts/Configuration__.ts

@@ -31,7 +31,10 @@ export class Configuration extends BaseNode {
   /**
    * 配置组列表
    */
-  @property('ConfigGroup')
+  @property({
+    objectRef: 'ConfigGroup',
+    isArray: true,
+  })
   groups: Array<ConfigGroup> = [];
 
   /**

package/src/concepts/Connection__.ts

@@ -56,7 +56,10 @@ export class Connection extends BaseNode {
   /**
    * 配置属性列表
    */
-  @property('ConfigProperty')
+  @property({
+    objectRef: 'ConfigProperty',
+    isArray: true,
+  })
   properties: Array<ConfigProperty> = [];
 
   /**