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

package/src/concepts/StructureProperty__.ts

@@ -13,23 +13,22 @@ interface defaultCode {
   code?: string;
   executeCode?: boolean;
 }
+import Structure from './Structure__';
+import Module from './Module__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 BaseNode from '../common/BaseNode';
-import type TypeAnnotation from './TypeAnnotation__';
-import type DefaultValue from './DefaultValue__';
-import type Structure from './Structure__';
-import type Module from './Module__';
-import type App from './App__';
+import TypeAnnotation from './TypeAnnotation__';
+import DefaultValue from './DefaultValue__';
 
 /**
  * 数据结构属性
@@ -38,7 +37,11 @@ import type App from './App__';
 export class StructureProperty extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'StructureProperty';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -48,24 +51,29 @@ export class StructureProperty extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'StructureProperty';
-
   /**
    * 数据结构属性名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 数据结构属性标题
    */
-  @property()
-  label!: string;
+  @property({
+    objectRef: '',
+  })
+  label: string;
 
   /**
    * 数据结构属性描述
    */
-  @property()
-  description!: string;
+  @property({
+    objectRef: '',
+  })
+  description: string;
 
   /**
    * 类型
@@ -73,13 +81,7 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation!: TypeAnnotation;
-
-  /**
-   * 是否必填
-   */
-  @property()
-  required!: boolean;
+  typeAnnotation: TypeAnnotation;
 
   /**
    * 默认值
@@ -87,32 +89,15 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue!: DefaultValue;
+  defaultValue: DefaultValue;
 
   /**
    * 数据结构字段 JSON 的序列化别名
    */
-  @property()
-  jsonName!: string;
-
-  /**
-   * 祖先 Structure
-   */
-  get structure() {
-    return this.getAncestor('Structure') as Structure;
-  }
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
+  @property({
+    objectRef: '',
+  })
+  jsonName: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -127,17 +112,6 @@ export class StructureProperty extends BaseNode {
     return super.from(source, parentNode, parentKey) as StructureProperty;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeStructureProperty?.(this);
-    }
-    return params;
-  }
   /**
    * 设置数据结构属性名称
    */
@@ -175,18 +149,6 @@ export class StructureProperty extends BaseNode {
     });
   }
 
-  /**
-   * 设置是否必填
-   */
-  setRequired(required: boolean) {
-    const object = {
-      required,
-    };
-    this.update({
-      ...object,
-    });
-  }
-
   /**
    * 设置数据结构字段 JSON 的序列化别名
    */
@@ -199,123 +161,23 @@ export class StructureProperty extends BaseNode {
     });
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
   /**
-   * 删除类型标注
-   * @param name 类型标注名称
-   */
-  removeTypeAnnotation(name: string): void;
-
-  /**
-   * 删除类型标注
-   * @param typeAnnotation 已有的类型标注实例
+   * 祖先 Structure
    */
-  removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
-
-  removeTypeAnnotation(options: string | TypeAnnotation) {
-    let typeAnnotation: TypeAnnotation;
-    if (typeof options === 'string') {
-      typeAnnotation = this.typeAnnotation;
-      if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
-      }
-    } else {
-      typeAnnotation = options;
-    }
-    return typeAnnotation.delete();
-  }
-
-  __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeAnnotation.__v_raw || typeAnnotation;
-      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;
+  get structure() {
+    return this.getAncestor('Structure') as Structure;
   }
-
-  /**
-   * 删除默认值
-   * @param name 默认值名称
-   */
-  removeDefaultValue(name: string): void;
-
   /**
-   * 删除默认值
-   * @param defaultValue 已有的默认值实例
+   * 祖先 Module
    */
-  removeDefaultValue(defaultValue: DefaultValue): void;
-
-  removeDefaultValue(options: string | DefaultValue) {
-    let defaultValue: DefaultValue;
-    if (typeof options === 'string') {
-      defaultValue = this.defaultValue;
-      if (!defaultValue) {
-        throw new Error('找不到默认值 ' + options);
-      }
-    } else {
-      defaultValue = options;
-    }
-    return defaultValue.delete();
-  }
-
-  __removeDefaultValue(defaultValue: DefaultValue) {
-    const parentKey = defaultValue.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: defaultValue,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = defaultValue.__v_raw || defaultValue;
-      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;
+  get module() {
+    return this.getAncestor('Module') as Module;
   }
 
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
-
   /**
    * 是否展开
    */

package/src/concepts/Structure__.ts

@@ -13,22 +13,21 @@ import {
 import type Namespace from './Namespace__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
 
+import Module from './Module__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 BaseNode from '../common/BaseNode';
-import type TypeParam from './TypeParam__';
-import type StructureProperty from './StructureProperty__';
-import type Module from './Module__';
-import type App from './App__';
+import TypeParam from './TypeParam__';
+import StructureProperty from './StructureProperty__';
 
 /**
  * 数据结构
@@ -37,7 +36,11 @@ import type App from './App__';
 export class Structure extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Structure';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -47,24 +50,29 @@ export class Structure extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Structure';
-
   /**
    * 数据结构名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 数据结构描述
    */
-  @property()
-  description!: string;
+  @property({
+    objectRef: '',
+  })
+  description: string;
 
   /**
    * 数据结构来源
    */
-  @property()
-  origin!: 'CallQueryComponent';
+  @property({
+    objectRef: '',
+  })
+  origin: 'CallQueryComponent';
 
   /**
    * 类型参数列表
@@ -74,7 +82,7 @@ export class Structure extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeParams: Array<TypeParam> = null;
+  typeParams?: Array<TypeParam> = null;
 
   /**
    * 数据结构属性列表
@@ -86,19 +94,6 @@ export class Structure extends BaseNode {
   })
   properties: Array<StructureProperty> = [];
 
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
-
   /**
    * @param source 需要合并的部分参数
    */
@@ -112,17 +107,6 @@ export class Structure extends BaseNode {
     return super.from(source, parentNode, parentKey) as Structure;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeStructure?.(this);
-    }
-    return params;
-  }
   /**
    * 设置数据结构名称
    */
@@ -150,7 +134,7 @@ export class Structure extends BaseNode {
 
   getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    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);
@@ -306,7 +290,7 @@ export class Structure extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.properties as StructureProperty[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+      .map((item) => item.name);
   }
   getPropertyUniqueName(name = 'property1') {
     return utils.unique(name, this.getPropertyExistingNames(), undefined, false);
@@ -483,37 +467,6 @@ export class Structure extends BaseNode {
     return typeParam.delete();
   }
 
-  __removeTypeParam(typeParam: TypeParam) {
-    const parentKey = typeParam.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeParam,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeParam.__v_raw || typeParam;
-      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 数据结构属性名称
@@ -539,41 +492,16 @@ export class Structure extends BaseNode {
     return property.delete();
   }
 
-  __removeStructureProperty(property: StructureProperty) {
-    const parentKey = property.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: property,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = property.__v_raw || property;
-      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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  /**
+   * 祖先 Module
+   */
+  get module() {
+    return this.getAncestor('Module') as Module;
+  }
 
   get integration() {
     return this.getAncestor('Integration');
@@ -653,6 +581,7 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.name}.structures`;
       return `extensions.${this.parentNode.name}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
@@ -672,6 +601,7 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.tsName}.structures`;
       return `extensions.${this.parentNode.tsName}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {

package/src/concepts/SwitchCase__.ts

@@ -14,12 +14,13 @@ 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';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
 import LogicItem from './LogicItem__';
 
 /**
@@ -29,7 +30,11 @@ import LogicItem from './LogicItem__';
 export class SwitchCase extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'SwitchCase';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -39,14 +44,13 @@ export class SwitchCase extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'SwitchCase';
-
   /**
    * 条件表达式
    */
   @property({
     objectRef: 'LogicItem',
   })
-  test!: LogicItem;
+  test: LogicItem;
 
   /**
    * then
@@ -187,73 +191,17 @@ export class SwitchCase extends LogicItem {
     return node;
   }
 
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeTest(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param test 已有的逻辑项实例
-   */
-  removeTest(test: LogicItem): void;
-
-  removeTest(options: string | LogicItem) {
-    let test: LogicItem;
-    if (typeof options === 'string') {
-      test = this.test;
-      if (!test) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      test = options;
-    }
-    return test.delete();
-  }
-
   /**
    * 删除逻辑项
    * @param logicItem 已有的逻辑项实例
    */
-  removeItemInConsequent(logicItem: LogicItem): void;
+  removeItem(logicItem: LogicItem): void;
 
-  removeItemInConsequent(options: LogicItem) {
+  removeItem(options: LogicItem) {
     let logicItem: LogicItem = options;
     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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。