@lcap/nasl 3.7.3-beta.1 → 3.8.0-beta.2

package/src/concepts/AssigneeV2__.ts

@@ -25,6 +25,8 @@ import * as asserts from './utils/asserts';
 import BaseNode from '../common/BaseNode';
 import MemberExpression from './MemberExpression__';
 import Logic from './Logic__';
+import DepartmentV2 from './DepartmentV2__';
+import ManagerV2 from './ManagerV2__';
 
 /**
  * 经办人
@@ -85,6 +87,26 @@ export class AssigneeV2 extends BaseNode {
   })
   fromLogics: Array<Logic> = [];
 
+  /**
+   * 部门用户
+   */
+  @property({
+    objectRef: 'DepartmentV2',
+    isArray: true,
+    defaultValue: [],
+  })
+  fromDepartments: Array<DepartmentV2> = [];
+
+  /**
+   * 主管用户
+   */
+  @property({
+    objectRef: 'ManagerV2',
+    isArray: true,
+    defaultValue: [],
+  })
+  fromManagers: Array<ManagerV2> = [];
+
   /**
    * @param source 需要合并的部分参数
    */
@@ -408,6 +430,316 @@ export class AssigneeV2 extends BaseNode {
     return node;
   }
 
+  getDepartmentV2ExistingNames(excludedList: Array<DepartmentV2> = []) {
+    const excludedSet = new Set(excludedList);
+    return ((this.fromDepartments as DepartmentV2[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
+  }
+  getDepartmentV2UniqueName(name = 'departmentV21') {
+    return utils.unique(name, this.getDepartmentV2ExistingNames(), undefined, false);
+  }
+
+  /**
+   * 插入部门用户
+   * @internal
+   * @param name 部门用户名称，如果不填会自动生成一个唯一名称
+   */
+  _insertDepartmentV2At(name: string, index: number): DepartmentV2;
+
+  /**
+   * 插入部门用户
+   * @internal
+   * @param departmentV2Options 部门用户参数
+   */
+  _insertDepartmentV2At(departmentV2Options: Partial<DepartmentV2>, index: number): DepartmentV2;
+
+  /**
+   * 插入部门用户
+   * @internal
+   * @param departmentV2 已有的部门用户实例
+   */
+  _insertDepartmentV2At(departmentV2: DepartmentV2, index: number): DepartmentV2;
+
+  _insertDepartmentV2At(options: string | Partial<DepartmentV2> | DepartmentV2, index: number) {
+    const departmentV2Options: any = {};
+    const relationOptions = { parentNode: this, parentKey: 'fromDepartments' };
+    const DepartmentV2 = getConceptConstructor('DepartmentV2');
+    let departmentV2: DepartmentV2;
+    if (!options) {
+      departmentV2 = DepartmentV2.from(
+        {
+          ...departmentV2Options,
+          name: this.getDepartmentV2UniqueName(),
+        },
+        this,
+        'fromDepartments',
+      );
+    } else if (typeof options === 'string') {
+      departmentV2 = DepartmentV2.from(
+        {
+          ...departmentV2Options,
+          name: options,
+        },
+        this,
+        'fromDepartments',
+      );
+    } else if (asserts.isDepartmentV2(options)) {
+      options.ensureDelete(); // 同一实例不支持多处存在
+      departmentV2 = options;
+      Object.assign(departmentV2, relationOptions);
+    } else {
+      departmentV2 = DepartmentV2.from(
+        {
+          ...departmentV2Options,
+          ...options,
+        },
+        this,
+        'fromDepartments',
+      );
+    }
+    this.fromDepartments.splice(index, 0, departmentV2);
+    return departmentV2;
+  }
+
+  /**
+   * 插入部门用户
+   * @param name 部门用户名称，如果不填会自动生成一个唯一名称
+   */
+  insertDepartmentV2At(name: string, index: number): DepartmentV2;
+
+  /**
+   * 插入部门用户
+   * @param departmentV2Options 部门用户参数
+   */
+  insertDepartmentV2At(departmentV2Options: Partial<DepartmentV2>, index: number): DepartmentV2;
+
+  /**
+   * 插入部门用户
+   * @param departmentV2 已有的部门用户实例
+   */
+  insertDepartmentV2At(departmentV2: DepartmentV2, index: number): DepartmentV2;
+
+  insertDepartmentV2At(options: string | Partial<DepartmentV2> | DepartmentV2, index: number) {
+    const node = this._insertDepartmentV2At(options as any, index);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'fromDepartments',
+    });
+    return node;
+  }
+
+  /**
+   * 添加部门用户
+   * @internal
+   * @param name 部门用户名称，如果不填会自动生成一个唯一名称
+   */
+  _addDepartmentV2(name?: string): DepartmentV2;
+
+  /**
+   * 添加部门用户
+   * @internal
+   * @param departmentV2Options 部门用户参数
+   */
+  _addDepartmentV2(departmentV2Options: Partial<DepartmentV2>): DepartmentV2;
+
+  /**
+   * 添加部门用户
+   * @internal
+   * @param departmentV2 已有的部门用户实例
+   */
+  _addDepartmentV2(departmentV2: DepartmentV2): DepartmentV2;
+
+  _addDepartmentV2(options?: string | Partial<DepartmentV2> | DepartmentV2) {
+    const index = this.fromDepartments.length;
+    return this._insertDepartmentV2At(options as any, index);
+  }
+
+  /**
+   * 添加部门用户
+   * @internal
+   * @param name 部门用户名称，如果不填会自动生成一个唯一名称
+   */
+  addDepartmentV2(name?: string): DepartmentV2;
+
+  /**
+   * 添加部门用户
+   * @param departmentV2Options 部门用户参数
+   */
+  addDepartmentV2(departmentV2Options: Partial<DepartmentV2>): DepartmentV2;
+
+  /**
+   * 添加部门用户
+   * @param departmentV2 已有的部门用户实例
+   */
+  addDepartmentV2(departmentV2: DepartmentV2): DepartmentV2;
+
+  addDepartmentV2(options?: string | Partial<DepartmentV2> | DepartmentV2) {
+    const node = this._addDepartmentV2(options as any);
+    const index = this.fromDepartments.indexOf(node);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'fromDepartments',
+    });
+    return node;
+  }
+
+  getManagerV2ExistingNames(excludedList: Array<ManagerV2> = []) {
+    const excludedSet = new Set(excludedList);
+    return ((this.fromManagers as ManagerV2[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+  }
+  getManagerV2UniqueName(name = 'managerV21') {
+    return utils.unique(name, this.getManagerV2ExistingNames(), undefined, false);
+  }
+
+  /**
+   * 插入主管
+   * @internal
+   * @param name 主管名称，如果不填会自动生成一个唯一名称
+   */
+  _insertManagerV2At(name: string, index: number): ManagerV2;
+
+  /**
+   * 插入主管
+   * @internal
+   * @param managerV2Options 主管参数
+   */
+  _insertManagerV2At(managerV2Options: Partial<ManagerV2>, index: number): ManagerV2;
+
+  /**
+   * 插入主管
+   * @internal
+   * @param managerV2 已有的主管实例
+   */
+  _insertManagerV2At(managerV2: ManagerV2, index: number): ManagerV2;
+
+  _insertManagerV2At(options: string | Partial<ManagerV2> | ManagerV2, index: number) {
+    const managerV2Options: any = {};
+    const relationOptions = { parentNode: this, parentKey: 'fromManagers' };
+    const ManagerV2 = getConceptConstructor('ManagerV2');
+    let managerV2: ManagerV2;
+    if (!options) {
+      managerV2 = ManagerV2.from(
+        {
+          ...managerV2Options,
+          name: this.getManagerV2UniqueName(),
+        },
+        this,
+        'fromManagers',
+      );
+    } else if (typeof options === 'string') {
+      managerV2 = ManagerV2.from(
+        {
+          ...managerV2Options,
+          name: options,
+        },
+        this,
+        'fromManagers',
+      );
+    } else if (asserts.isManagerV2(options)) {
+      options.ensureDelete(); // 同一实例不支持多处存在
+      managerV2 = options;
+      Object.assign(managerV2, relationOptions);
+    } else {
+      managerV2 = ManagerV2.from(
+        {
+          ...managerV2Options,
+          ...options,
+        },
+        this,
+        'fromManagers',
+      );
+    }
+    this.fromManagers.splice(index, 0, managerV2);
+    return managerV2;
+  }
+
+  /**
+   * 插入主管
+   * @param name 主管名称，如果不填会自动生成一个唯一名称
+   */
+  insertManagerV2At(name: string, index: number): ManagerV2;
+
+  /**
+   * 插入主管
+   * @param managerV2Options 主管参数
+   */
+  insertManagerV2At(managerV2Options: Partial<ManagerV2>, index: number): ManagerV2;
+
+  /**
+   * 插入主管
+   * @param managerV2 已有的主管实例
+   */
+  insertManagerV2At(managerV2: ManagerV2, index: number): ManagerV2;
+
+  insertManagerV2At(options: string | Partial<ManagerV2> | ManagerV2, index: number) {
+    const node = this._insertManagerV2At(options as any, index);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'fromManagers',
+    });
+    return node;
+  }
+
+  /**
+   * 添加主管
+   * @internal
+   * @param name 主管名称，如果不填会自动生成一个唯一名称
+   */
+  _addManagerV2(name?: string): ManagerV2;
+
+  /**
+   * 添加主管
+   * @internal
+   * @param managerV2Options 主管参数
+   */
+  _addManagerV2(managerV2Options: Partial<ManagerV2>): ManagerV2;
+
+  /**
+   * 添加主管
+   * @internal
+   * @param managerV2 已有的主管实例
+   */
+  _addManagerV2(managerV2: ManagerV2): ManagerV2;
+
+  _addManagerV2(options?: string | Partial<ManagerV2> | ManagerV2) {
+    const index = this.fromManagers.length;
+    return this._insertManagerV2At(options as any, index);
+  }
+
+  /**
+   * 添加主管
+   * @internal
+   * @param name 主管名称，如果不填会自动生成一个唯一名称
+   */
+  addManagerV2(name?: string): ManagerV2;
+
+  /**
+   * 添加主管
+   * @param managerV2Options 主管参数
+   */
+  addManagerV2(managerV2Options: Partial<ManagerV2>): ManagerV2;
+
+  /**
+   * 添加主管
+   * @param managerV2 已有的主管实例
+   */
+  addManagerV2(managerV2: ManagerV2): ManagerV2;
+
+  addManagerV2(options?: string | Partial<ManagerV2> | ManagerV2) {
+    const node = this._addManagerV2(options as any);
+    const index = this.fromManagers.indexOf(node);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'fromManagers',
+    });
+    return node;
+  }
+
   /**
    * 删除成员表达式
    * @param name 成员表达式名称
@@ -458,6 +790,56 @@ export class AssigneeV2 extends BaseNode {
     return logic.delete();
   }
 
+  /**
+   * 删除部门用户
+   * @param name 部门用户名称
+   */
+  removeDepartmentV2(name: string): void;
+
+  /**
+   * 删除部门用户
+   * @param departmentV2 已有的部门用户实例
+   */
+  removeDepartmentV2(departmentV2: DepartmentV2): void;
+
+  removeDepartmentV2(options: string | DepartmentV2) {
+    let departmentV2: DepartmentV2;
+    if (typeof options === 'string') {
+      departmentV2 = (this.fromDepartments as DepartmentV2[]).find((item) => item.name === options);
+      if (!departmentV2) {
+        throw new Error('找不到部门用户 ' + options);
+      }
+    } else {
+      departmentV2 = options;
+    }
+    return departmentV2.delete();
+  }
+
+  /**
+   * 删除主管
+   * @param name 主管名称
+   */
+  removeManagerV2(name: string): void;
+
+  /**
+   * 删除主管
+   * @param managerV2 已有的主管实例
+   */
+  removeManagerV2(managerV2: ManagerV2): void;
+
+  removeManagerV2(options: string | ManagerV2) {
+    let managerV2: ManagerV2;
+    if (typeof options === 'string') {
+      managerV2 = (this.fromManagers as ManagerV2[]).find((item) => item.name === options);
+      if (!managerV2) {
+        throw new Error('找不到主管 ' + options);
+      }
+    } else {
+      managerV2 = options;
+    }
+    return managerV2.delete();
+  }
+
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -471,6 +853,10 @@ export class AssigneeV2 extends BaseNode {
     return this.getAncestor('ProcessV2') as ProcessV2;
   }
 
+  get isFormProcess() {
+    return this.processV2?.isFormProcess;
+  }
+
   getNamespace(ns: string) {
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
@@ -498,7 +884,7 @@ export class AssigneeV2 extends BaseNode {
     const tab = indent(state?.tabSize || 0);
     let code = prevCode;
     if (
-      ![...(self.users || []), ...(self.fromVariables || []), ...(self.fromLogics || []), ...(self.roles || [])].length
+      ![...(self.users || []), ...(self.fromDepartments || []), ...(self.fromManagers || []), ...(self.fromVariables || []), ...(self.fromLogics || []), ...(self.roles || [])].length
     ) {
       // 任务完成人为空会有一个提示信息
       code += `${tab}__UsersEmpty__;\n`;

package/src/concepts/AuthLogicForCallInterface__.ts

@@ -56,7 +56,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['AuthLogic', 'Logic', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['AuthLogic', 'Logic', 'Annotatable', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/AuthLogic__.ts

@@ -30,7 +30,7 @@ export class AuthLogic extends Logic {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['Logic', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Logic', 'Annotatable', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/BooleanLiteral__.ts

@@ -82,7 +82,15 @@ export class BooleanLiteral extends LogicItem {
   toBrief(): string {
     return this.value;
   }
-
+  toBoolean(): any {
+    if (this.value === 'true') {
+      return true;
+    }
+    if (this.value === 'false') {
+      return false;
+    }
+    return this.value;
+  }
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     return `new nasl.core.Boolean(${this.value})`;

package/src/concepts/BusinessLogic__.ts

@@ -39,7 +39,7 @@ export class BusinessLogic extends Logic {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['Logic', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Logic', 'Annotatable', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/CallFunction__.ts

@@ -690,7 +690,7 @@ export class CallFunction extends LogicItem {
         if (!arg) {
           code += '__IDENTIFIER__';
         } else {
-          code += indent(state.tabSize + 1) + arg.toNaturalTS(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 }));
+          code += arg.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
         }
         if (index !== this.arguments.length - 1) {
           code += ',\n';