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

package/src/concepts/Logic__.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from 'uuid';
 import { FrontendLibrary } from './FrontendLibrary__';
 import {
   TranslatorState,
@@ -20,18 +21,15 @@ import MatchCase from './MatchCase__';
 import TypeAnnotation from './TypeAnnotation__';
 import CallInterface from './CallInterface__';
 import CallLogic from './CallLogic__';
-import ViewElement from './ViewElement__';
-import { SynatxNode } from './types__';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 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 Transactional from './Transactional__';
 import TypeParam from './TypeParam__';
@@ -46,7 +44,6 @@ import ProcessElement from './ProcessElement__';
 import App from './App__';
 import Frontend from './Frontend__';
 import Process from './Process__';
-import { NaslServer } from 'src/server';
 
 /**
  * 逻辑
@@ -109,44 +106,64 @@ export class Logic extends BaseNode {
   /**
    * 事务
    */
-  @property('Transactional')
+  @property({
+    objectRef: 'Transactional',
+  })
   // @ts-ignore
   transactional!: Transactional;
 
   /**
    * 类型参数列表
    */
-  @property('TypeParam')
+  @property({
+    objectRef: 'TypeParam',
+    isArray: true,
+  })
   typeParams: Array<TypeParam> = null;
 
   /**
    * 输入参数列表
    */
-  @property('Param')
+  @property({
+    objectRef: 'Param',
+    isArray: true,
+  })
   params: Array<Param> = [];
 
   /**
    * 输出参数列表
    */
-  @property('Return')
+  @property({
+    objectRef: 'Return',
+    isArray: true,
+  })
   returns: Array<Return> = [];
 
   /**
    * 变量列表
    */
-  @property('Variable')
+  @property({
+    objectRef: 'Variable',
+    isArray: true,
+  })
   variables: Array<Variable> = [];
 
   /**
    * 逻辑项列表
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   body: Array<LogicItem> = [];
 
   /**
    * 逻辑项列表
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   playground: Array<LogicItem> = [];
 
   /**
@@ -155,36 +172,42 @@ export class Logic extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
   get app() {
     return this.getAncestor('App') as App;
   }
+
   /**
    * 祖先 Connector
    */
   get connector() {
     return this.getAncestor('Connector') as Connector;
   }
+
   /**
    * 祖先 View
    */
   get view() {
     return this.getAncestor('View') as View;
   }
+
   /**
    * 祖先 Frontend
    */
   get frontend() {
     return this.getAncestor('Frontend') as Frontend;
   }
+
   /**
    * 祖先 ProcessElement
    */
   get processElement() {
     return this.getAncestor('ProcessElement') as ProcessElement;
   }
+
   /**
    * 祖先 Process
    */
@@ -196,7 +219,7 @@ export class Logic extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Logic>) {
-    source = Object.assign({}, Logic.getDefaultOptions(), source);
+    source = { ...Logic.getDefaultOptions(), ...source};
     super(source);
     super.subConstructor(source);
   }
@@ -216,6 +239,7 @@ export class Logic extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置逻辑名称
    */
@@ -308,6 +332,7 @@ export class Logic extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getTypeParamUniqueName(name = 'typeParam1') {
     return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);
   }
@@ -1121,7 +1146,7 @@ export class Logic extends BaseNode {
     if (typeof options === 'string') {
       transactional = this.transactional;
       if (!transactional) {
-        throw new Error('找不到事务 ' + options);
+        throw new Error(`找不到事务 ${  options}`);
       }
     } else {
       transactional = options;
@@ -1130,7 +1155,7 @@ export class Logic extends BaseNode {
   }
 
   __removeTransactional(transactional: Transactional) {
-    const parentKey = transactional.parentKey;
+    const {parentKey} = transactional;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1169,7 +1194,7 @@ export class Logic extends BaseNode {
     if (typeof options === 'string') {
       typeParam = (this.typeParams as TypeParam[]).find((item) => item.name === options);
       if (!typeParam) {
-        throw new Error('找不到类型参数 ' + options);
+        throw new Error(`找不到类型参数 ${  options}`);
       }
     } else {
       typeParam = options;
@@ -1178,7 +1203,7 @@ export class Logic extends BaseNode {
   }
 
   __removeTypeParam(typeParam: TypeParam) {
-    const parentKey = typeParam.parentKey;
+    const {parentKey} = typeParam;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1217,7 +1242,7 @@ export class Logic extends BaseNode {
     if (typeof options === 'string') {
       param = (this.params as Param[]).find((item) => item.name === options);
       if (!param) {
-        throw new Error('找不到输入参数 ' + options);
+        throw new Error(`找不到输入参数 ${  options}`);
       }
     } else {
       param = options;
@@ -1226,7 +1251,7 @@ export class Logic extends BaseNode {
   }
 
   __removeParam(param: Param) {
-    const parentKey = param.parentKey;
+    const {parentKey} = param;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1265,7 +1290,7 @@ export class Logic extends BaseNode {
     if (typeof options === 'string') {
       ret = (this.returns as Return[]).find((item) => item.name === options);
       if (!ret) {
-        throw new Error('找不到输出参数 ' + options);
+        throw new Error(`找不到输出参数 ${  options}`);
       }
     } else {
       ret = options;
@@ -1274,7 +1299,7 @@ export class Logic extends BaseNode {
   }
 
   __removeReturn(ret: Return) {
-    const parentKey = ret.parentKey;
+    const {parentKey} = ret;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1313,7 +1338,7 @@ export class Logic extends BaseNode {
     if (typeof options === 'string') {
       variable = (this.variables as Variable[]).find((item) => item.name === options);
       if (!variable) {
-        throw new Error('找不到变量 ' + options);
+        throw new Error(`找不到变量 ${  options}`);
       }
     } else {
       variable = options;
@@ -1322,7 +1347,7 @@ export class Logic extends BaseNode {
   }
 
   __removeVariable(variable: Variable) {
-    const parentKey = variable.parentKey;
+    const {parentKey} = variable;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1351,7 +1376,7 @@ export class Logic extends BaseNode {
   removeItemInBody(logicItem: LogicItem): void;
 
   removeItemInBody(options: LogicItem) {
-    let logicItem: LogicItem = options;
+    const logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
@@ -1362,12 +1387,12 @@ export class Logic extends BaseNode {
   removeItemInPlayground(logicItem: LogicItem): void;
 
   removeItemInPlayground(options: LogicItem) {
-    let logicItem: LogicItem = options;
+    const logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const {parentKey} = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1389,10 +1414,10 @@ export class Logic extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   // 用于calllogic树中定位是那个logic，回显
   get calleewholeKey() {
     return `${this.getNamespace()}.${this.name}`;
@@ -1980,7 +2005,6 @@ ${indent(state.tabSize)} */\n`;
 
     // 需要类型推导的局部变量/返回值需要调整申明顺序
     const advanceMap: Map<Return | Variable, Assignment | BatchAssignment> = new Map();
-    const needGetSourceMapOqlList: Promise<any>[] = [];
     this.traverseChildren((el) => {
       if (el && (el instanceof BatchAssignment || (el instanceof Assignment && el.left?.name))) {
         const jsCode = el.toJS();
@@ -1995,27 +2019,8 @@ ${indent(state.tabSize)} */\n`;
           advanceMap.set(advanceRn, el);
         }
       }
-      // 如果有sql查询组件就需要把他们存起来
-      if (el instanceof OqlQueryComponent) {
-        if (!el.codeSourceMap) {
-          needGetSourceMapOqlList.push(el.requestEmbeddedTS());
-        }
-      }
     });
 
-    if (needGetSourceMapOqlList.length) {
-      Promise.all(needGetSourceMapOqlList).then(() => {
-        // 触发一下更新重新生成代码
-        (this.app as any)?.naslServer?.embeddedTSEmitter.emit('change', {
-          value: [{
-            originEvent: {
-              action: 'update',
-              target: this,
-            },
-          }],
-        });
-      });
-    }
     // 兼容 return 没有类型情况
     if (this.returns.length && this.returns[0].typeAnnotation) {
       code += ': ';
@@ -2031,13 +2036,13 @@ ${indent(state.tabSize)} */\n`;
         code += variable.toNaturalTS(shiftState(state, code, { inline: true }));
         code += ';\n';
       });
-  
+
       this.returns.forEach((ret) => {
         code += `${indent(state.tabSize + 1)}let `;
         code += ret.toNaturalTS(shiftState(state, code, { inline: true }));
         code += ';\n';
       });
-  
+
       code += `${indent(state.tabSize + 1)}// 当前位置\n`;
       if (!this.body.length && this.returns.length) {
         code += `${indent(state.tabSize + 1)}return ${this.returns[0].name};\n`;
@@ -2055,7 +2060,7 @@ ${indent(state.tabSize)} */\n`;
           }
         });
       }
-  
+
       code += `${indent(state.tabSize)}}`;
     }
     if (prefix === 'inObject') {
@@ -2116,7 +2121,7 @@ ${indent(state.tabSize)} */\n`;
   handleForEachCode(code: string, forEachStatement: ForEachStatement): string {
     const { item, index, each } = forEachStatement;
     if (code.includes(item.name)) {
-      const eachTSCode = each.toEmbeddedTS();
+      const eachTSCode = each ? each.toEmbeddedTS() : '__IDENTIFIER__'
       code = this.handleReplaceCode(
         code,
         item.name,
@@ -2455,14 +2460,14 @@ ${indent(state.tabSize)} */\n`;
     return findHasError;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
 export default Logic;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/MatchCase__.ts

@@ -37,13 +37,19 @@ export class MatchCase extends LogicItem {
   /**
    * 条件表达式
    */
-  @property('LogicItem | TypeAnnotation')
+  @property({
+    objectRef: 'LogicItem | TypeAnnotation',
+    isArray: true,
+  })
   patterns: Array<LogicItem | TypeAnnotation> = [];
 
   /**
    * then
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   body: Array<LogicItem> = [];
 
   /**

package/src/concepts/Match__.ts

@@ -38,7 +38,9 @@ export class Match extends LogicItem {
   /**
    * 逻辑项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   expression!: LogicItem;
 
@@ -51,7 +53,10 @@ export class Match extends LogicItem {
   /**
    * 匹配分支列表
    */
-  @property('MatchCase')
+  @property({
+    objectRef: 'MatchCase',
+    isArray: true,
+  })
   cases: Array<MatchCase> = [];
 
   /**

package/src/concepts/MemberExpression__.ts

@@ -46,14 +46,18 @@ export class MemberExpression extends LogicItem {
   /**
    * 逻辑项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   object!: LogicItem;
 
   /**
    * 逻辑项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   property!: LogicItem;
 

package/src/concepts/Module__.ts

@@ -117,86 +117,127 @@ export class Module extends BaseNode {
   /**
    * 数据源列表
    */
-  @property('DataSource')
+  @property({
+    objectRef: 'DataSource',
+    isArray: true,
+  })
   dataSources: Array<DataSource> = [];
 
   /**
    * 数据结构列表
    */
-  @property('Structure')
+  @property({
+    objectRef: 'Structure',
+    isArray: true,
+  })
   structures: Array<Structure> = [];
 
   /**
    * 枚举列表
    */
-  @property('Enum')
+  @property({
+    objectRef: 'Enum',
+    isArray: true,
+  })
   enums: Array<Enum> = [];
 
   /**
    * 逻辑列表
    */
-  @property('Logic')
+  @property({
+    objectRef: 'Logic',
+    isArray: true,
+  })
   logics: Array<Logic> = [];
 
   /**
    * 接口列表
    */
-  @property('Interface')
+  @property({
+    objectRef: 'Interface',
+    isArray: true,
+  })
   interfaces: Array<Interface> = [];
 
   /**
    * 页面列表
    */
-  @property('View')
+  @property({
+    objectRef: 'View',
+    isArray: true,
+  })
   views: Array<View> = [];
 
   /**
    * 变量列表
    */
-  @property('Variable')
+  @property({
+    objectRef: 'Variable',
+    isArray: true,
+  })
   frontendVariables: Array<Variable> = [];
 
   /**
    * 流程列表
    */
-  @property('Process')
+  @property({
+    objectRef: 'Process',
+    isArray: true,
+  })
   processes: Array<Process> = [];
 
   /**
    * 前端库列表
    */
-  @property('FrontendLibrary')
+  @property({
+    objectRef: 'FrontendLibrary',
+    isArray: true,
+  })
   frontends: Array<FrontendLibrary> = [];
 
   /**
    * 配置管理
    */
-  @property('Configuration')
+  @property({
+    objectRef: 'Configuration',
+  })
   // @ts-ignore
   configuration!: Configuration;
 
   /**
    * 暴露接口的接口鉴权
    */
-  @property('AuthLogic')
+  @property({
+    objectRef: 'AuthLogic',
+    isArray: true,
+  })
   authLogics: Array<AuthLogic> = [];
 
   /**
    * 调用接口的鉴权模板
    */
-  @property('AuthLogicForCallInterface')
+  @property({
+    objectRef: 'AuthLogicForCallInterface',
+    isArray: true,
+  })
   authLogicsForCallInterface: Array<AuthLogicForCallInterface> = [];
 
   /**
    * 触发器启动器列表
    */
-  @property('TriggerLauncher')
+  @property({
+    objectRef: 'TriggerLauncher',
+    isArray: true,
+  })
   triggerLaunchers: Array<TriggerLauncher> = [];
 
   /**
    * 连接列表
    */
-  @property('Connection')
+  @property({
+    objectRef: 'Connection',
+    isArray: true,
+  })
   connections: Array<Connection> = [];
 
   /**

package/src/concepts/MsgTriggerEvent__.ts

@@ -36,7 +36,10 @@ export class MsgTriggerEvent extends TriggerEvent {
   /**
    * 输入参数列表
    */
-  @property('Param')
+  @property({
+    objectRef: 'Param',
+    isArray: true,
+  })
   properties: Array<Param> = [];
 
   /**

package/src/concepts/MsgTriggerLauncher__.ts

@@ -33,7 +33,10 @@ export class MsgTriggerLauncher extends TriggerLauncher {
   /**
    * 实际参数列表
    */
-  @property('Argument')
+  @property({
+    objectRef: 'Argument',
+    isArray: true,
+  })
   properties: Array<Argument> = [];
 
   /**