@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/concepts/Argument__.ts

@@ -19,12 +19,13 @@ import type CallFunction from './CallFunction__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
 import LogicItem from './LogicItem__';
 
 /**
@@ -34,7 +35,11 @@ import LogicItem from './LogicItem__';
 export class Argument extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'Argument';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -44,18 +49,21 @@ export class Argument extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Argument';
-
   /**
    * 参数名
    */
-  @property()
-  keyword!: string;
+  @property({
+    objectRef: '',
+  })
+  keyword: string;
 
   /**
    * 是否为展开参数
    */
-  @property()
-  spread!: boolean;
+  @property({
+    objectRef: '',
+  })
+  spread: boolean;
 
   /**
    * 参数值
@@ -63,7 +71,7 @@ export class Argument extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  expression!: LogicItem;
+  expression: LogicItem;
 
   /**
    * @param source 需要合并的部分参数
@@ -93,62 +101,6 @@ export class Argument extends LogicItem {
     });
   }
 
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeExpression(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param expression 已有的逻辑项实例
-   */
-  removeExpression(expression: LogicItem): void;
-
-  removeExpression(options: string | LogicItem) {
-    let expression: LogicItem;
-    if (typeof options === 'string') {
-      expression = this.expression;
-      if (!expression) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      expression = options;
-    }
-    return expression.delete();
-  }
-
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/Assignee__.ts

@@ -9,21 +9,23 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import { ProcessElement, Process } from '..';
 import type Namespace from './Namespace__';
+import ProcessElement from './ProcessElement__';
+import Process from './Process__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
 import LogicItem from './LogicItem__';
-import type Logic from './Logic__';
+import Logic from './Logic__';
 
 /**
  * 经办人
@@ -32,7 +34,11 @@ import type Logic from './Logic__';
 export class Assignee extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'Assignee';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -42,11 +48,11 @@ export class Assignee extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Assignee';
-
   /**
    * 绑定用户
    */
   @property({
+    objectRef: '',
     isArray: true,
     defaultValue: [],
   })
@@ -66,6 +72,7 @@ export class Assignee extends LogicItem {
    * 绑定角色
    */
   @property({
+    objectRef: '',
     isArray: true,
     defaultValue: [],
   })
@@ -106,9 +113,7 @@ export class Assignee extends LogicItem {
 
   getLogicItemExistingNames(excludedList: Array<LogicItem> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.dynamicUsers as LogicItem[]) || [])
-      .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+    return ((this.dynamicUsers as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getLogicItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
@@ -408,7 +413,7 @@ export class Assignee extends LogicItem {
 
   getLogicExistingNames(excludedList: Array<Logic> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.logicUsers as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    return ((this.logicUsers as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, false);
@@ -610,37 +615,6 @@ export class Assignee extends LogicItem {
     return logicItem.delete();
   }
 
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除逻辑
    * @param name 逻辑名称
@@ -666,37 +640,6 @@ export class Assignee extends LogicItem {
     return logic.delete();
   }
 
-  __removeLogic(logic: Logic) {
-    const parentKey = logic.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logic,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logic.__v_raw || logic;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -707,7 +650,6 @@ export class Assignee extends LogicItem {
   get processElement() {
     return this.getAncestor('ProcessElement') as ProcessElement;
   }
-
   /**
    * 祖先 Process
    */

package/src/concepts/AssignmentLine__.ts

@@ -13,7 +13,7 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
@@ -28,7 +28,11 @@ import BaseNode from '../common/BaseNode';
 export class AssignmentLine extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'AssignmentLine';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -38,11 +42,11 @@ export class AssignmentLine extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'AssignmentLine';
-
   /**
    * 左侧索引
    */
   @property({
+    objectRef: '',
     isArray: true,
     defaultValue: [],
   })
@@ -52,6 +56,7 @@ export class AssignmentLine extends BaseNode {
    * 右侧索引
    */
   @property({
+    objectRef: '',
     isArray: true,
     defaultValue: [],
   })
@@ -70,17 +75,6 @@ export class AssignmentLine extends BaseNode {
     return super.from(source, parentNode, parentKey) as AssignmentLine;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeAssignmentLine?.(this);
-    }
-    return params;
-  }
   /**
    * 设置左侧索引
    */
@@ -109,6 +103,7 @@ export class AssignmentLine extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;

package/src/concepts/Assignment__.ts

@@ -19,12 +19,13 @@ import type MemberExpression from './MemberExpression__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
 import LogicItem from './LogicItem__';
 
 /**
@@ -34,7 +35,11 @@ import LogicItem from './LogicItem__';
 export class Assignment extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'Assignment';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -44,20 +49,13 @@ export class Assignment extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Assignment';
-
-  /**
-   * 赋值语句标题
-   */
-  @property()
-  label: string = '赋值';
-
   /**
    * 左边项
    */
   @property({
     objectRef: 'LogicItem',
   })
-  left!: LogicItem;
+  left: LogicItem;
 
   /**
    * 右边项
@@ -65,7 +63,7 @@ export class Assignment extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  right!: LogicItem;
+  right: LogicItem;
 
   /**
    * @param source 需要合并的部分参数
@@ -110,87 +108,6 @@ export class Assignment extends LogicItem {
     });
   }
 
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeLeft(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param left 已有的逻辑项实例
-   */
-  removeLeft(left: LogicItem): void;
-
-  removeLeft(options: string | LogicItem) {
-    let left: LogicItem;
-    if (typeof options === 'string') {
-      left = this.left;
-      if (!left) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      left = options;
-    }
-    return left.delete();
-  }
-
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeRight(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param right 已有的逻辑项实例
-   */
-  removeRight(right: LogicItem): void;
-
-  removeRight(options: string | LogicItem) {
-    let right: LogicItem;
-    if (typeof options === 'string') {
-      right = this.right;
-      if (!right) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      right = options;
-    }
-    return right.delete();
-  }
-
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。