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

package/src/concepts/EntityProperty__.ts

@@ -18,25 +18,25 @@ interface defaultCode {
   code?: string;
   executeCode?: boolean;
 }
+import App from './App__';
+import Entity from './Entity__';
+import Module from './Module__';
+import DataSource from './DataSource__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 DatabaseTypeAnnotation from './DatabaseTypeAnnotation__';
-import type DefaultValue from './DefaultValue__';
-import type Entity from './Entity__';
-import type Module from './Module__';
-import type App from './App__';
-import type DataSource from './DataSource__';
+import TypeAnnotation from './TypeAnnotation__';
+import DatabaseTypeAnnotation from './DatabaseTypeAnnotation__';
+import DefaultValue from './DefaultValue__';
 
 /**
  * 实体属性
@@ -45,7 +45,11 @@ import type DataSource from './DataSource__';
 export class EntityProperty extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'EntityProperty';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -55,36 +59,45 @@ export class EntityProperty extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'EntityProperty';
-
   /**
    * 实体属性名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 唯一标识
    */
-  @property()
+  @property({
+    objectRef: '',
+  })
   uuid: string = uuidv4().replace(/-/g, '');
 
   /**
    * 数据库列名
    */
-  @property()
-  columnName!: string;
+  @property({
+    objectRef: '',
+  })
+  columnName: string;
 
   /**
    * 实体属性标题
    */
-  @property()
-  label!: string;
+  @property({
+    objectRef: '',
+  })
+  label: string;
 
   /**
    * 实体属性描述
    */
-  @property()
-  description!: string;
+  @property({
+    objectRef: '',
+  })
+  description: string;
 
   /**
    * 类型
@@ -92,7 +105,7 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation;
 
   /**
    * 数据库存储类型
@@ -100,13 +113,15 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'DatabaseTypeAnnotation',
   })
-  databaseTypeAnnotation!: DatabaseTypeAnnotation;
+  databaseTypeAnnotation: DatabaseTypeAnnotation;
 
   /**
    * 是否必填
    */
-  @property()
-  required!: boolean;
+  @property({
+    objectRef: '',
+  })
+  required: boolean;
 
   /**
    * 默认值
@@ -114,43 +129,57 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue!: DefaultValue;
+  defaultValue: DefaultValue;
 
   /**
    * 当前属性是否为主键
    */
-  @property()
-  primaryKey!: boolean;
+  @property({
+    objectRef: '',
+  })
+  primaryKey: boolean;
 
   /**
    * 关联实体的命名空间
    */
-  @property()
-  relationNamespace!: string;
+  @property({
+    objectRef: '',
+  })
+  relationNamespace: string;
 
   /**
    * 关联实体
    */
-  @property()
-  relationEntity!: string;
+  @property({
+    objectRef: '',
+  })
+  relationEntity: string;
 
   /**
    * 关联属性
    */
-  @property()
-  relationProperty!: string;
+  @property({
+    objectRef: '',
+  })
+  relationProperty: string;
 
   /**
    * 关联属性实体记录删除规则
    */
-  @property()
-  deleteRule!: 'protect' | 'cascade';
+  @property({
+    objectRef: '',
+  })
+  deleteRule: 'protect' | 'cascade';
 
   /**
    * 显示方式
    */
-  @property()
-  display: { [name: string]: boolean } = {
+  @property({
+    objectRef: '',
+  })
+  display: {
+    [name: string]: boolean;
+  } = {
     inDetail: true,
     inFilter: true,
     inForm: true,
@@ -161,6 +190,7 @@ export class EntityProperty extends BaseNode {
    * 验证规则
    */
   @property({
+    objectRef: '',
     isArray: true,
     defaultValue: [],
   })
@@ -169,39 +199,18 @@ export class EntityProperty extends BaseNode {
   /**
    * 生成规则
    */
-  @property()
+  @property({
+    objectRef: '',
+  })
   generationRule: 'auto' | 'autoIncrement' | 'manual' = 'auto';
 
   /**
    * 表示 Oracle 主键自增时的序列名称
    */
-  @property()
-  sequence!: string;
-
-  /**
-   * 祖先 Entity
-   */
-  get entity() {
-    return this.getAncestor('Entity') as Entity;
-  }
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
-  /**
-   * 祖先 DataSource
-   */
-  get dataSource() {
-    return this.getAncestor('DataSource') as DataSource;
-  }
+  @property({
+    objectRef: '',
+  })
+  sequence: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -216,17 +225,6 @@ export class EntityProperty extends BaseNode {
     return super.from(source, parentNode, parentKey) as EntityProperty;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeEntityProperty?.(this);
-    }
-    return params;
-  }
   /**
    * 设置实体属性标题
    */
@@ -302,179 +300,29 @@ export class EntityProperty extends BaseNode {
     });
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
   /**
-   * 删除类型标注
-   * @param name 类型标注名称
-   */
-  removeTypeAnnotation(name: string): void;
-
-  /**
-   * 删除类型标注
-   * @param typeAnnotation 已有的类型标注实例
+   * 祖先 Entity
    */
-  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 entity() {
+    return this.getAncestor('Entity') as Entity;
   }
-
-  /**
-   * 删除数据库存储类型
-   * @param name 数据库存储类型名称
-   */
-  removeDatabaseTypeAnnotation(name: string): void;
-
   /**
-   * 删除数据库存储类型
-   * @param databaseTypeAnnotation 已有的数据库存储类型实例
+   * 祖先 Module
    */
-  removeDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation): void;
-
-  removeDatabaseTypeAnnotation(options: string | DatabaseTypeAnnotation) {
-    let databaseTypeAnnotation: DatabaseTypeAnnotation;
-    if (typeof options === 'string') {
-      databaseTypeAnnotation = this.databaseTypeAnnotation;
-      if (!databaseTypeAnnotation) {
-        throw new Error('找不到数据库存储类型 ' + options);
-      }
-    } else {
-      databaseTypeAnnotation = options;
-    }
-    return databaseTypeAnnotation.delete();
-  }
-
-  __removeDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation) {
-    const parentKey = databaseTypeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: databaseTypeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = databaseTypeAnnotation.__v_raw || databaseTypeAnnotation;
-      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;
   }
-
-  /**
-   * 删除默认值
-   * @param name 默认值名称
-   */
-  removeDefaultValue(name: string): void;
-
   /**
-   * 删除默认值
-   * @param defaultValue 已有的默认值实例
+   * 祖先 DataSource
    */
-  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 dataSource() {
+    return this.getAncestor('DataSource') as DataSource;
   }
 
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
-
   /**
    * 设置实体属性名称
    */

package/src/concepts/Entity__.ts

@@ -13,23 +13,22 @@ import {
 } from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
 import type CallQueryComponent from './CallQueryComponent__';
+import Module from './Module__';
+import DataSource from './DataSource__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 EntityProperty from './EntityProperty__';
-import type EntityIndex from './EntityIndex__';
-import type Module from './Module__';
-import type DataSource from './DataSource__';
-import type App from './App__';
+import EntityProperty from './EntityProperty__';
+import EntityIndex from './EntityIndex__';
 
 /**
  * 实体
@@ -38,7 +37,11 @@ import type App from './App__';
 export class Entity extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Entity';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -48,36 +51,45 @@ export class Entity extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Entity';
-
   /**
    * 实体名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 唯一标识
    */
-  @property()
+  @property({
+    objectRef: '',
+  })
   uuid: string = uuidv4().replace(/-/g, '');
 
   /**
    * 数据库表名
    */
-  @property()
-  tableName!: string;
+  @property({
+    objectRef: '',
+  })
+  tableName: string;
 
   /**
    * 实体描述
    */
-  @property()
-  description!: string;
+  @property({
+    objectRef: '',
+  })
+  description: string;
 
   /**
    * 实体来源
    */
-  @property()
-  origin: 'ide' | 'sql' | 'table' | 'excel' | 'form' = 'ide';
+  @property({
+    objectRef: '',
+  })
+  origin: 'ide' | 'sql' | 'table' | 'excel' = 'ide';
 
   /**
    * 实体属性列表
@@ -99,25 +111,6 @@ export class Entity extends BaseNode {
   })
   indexes: Array<EntityIndex> = [];
 
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
-  /**
-   * 祖先 DataSource
-   */
-  get dataSource() {
-    return this.getAncestor('DataSource') as DataSource;
-  }
-
   /**
    * @param source 需要合并的部分参数
    */
@@ -131,17 +124,6 @@ export class Entity extends BaseNode {
     return super.from(source, parentNode, parentKey) as Entity;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeEntity?.(this);
-    }
-    return params;
-  }
   /**
    * 设置实体描述
    */
@@ -158,7 +140,7 @@ export class Entity extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.properties as EntityProperty[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+      .map((item) => item.name);
   }
   getPropertyUniqueName(name = 'property1') {
     return utils.unique(name, this.getPropertyExistingNames(), undefined, false);
@@ -312,7 +294,7 @@ export class Entity extends BaseNode {
 
   getEntityIndexExistingNames(excludedList: Array<EntityIndex> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.indexes as EntityIndex[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    return ((this.indexes as EntityIndex[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getEntityIndexUniqueName(name = 'entityIndex1') {
     return utils.unique(name, this.getEntityIndexExistingNames(), undefined, false);
@@ -489,37 +471,6 @@ export class Entity extends BaseNode {
     return property.delete();
   }
 
-  __removeEntityProperty(property: EntityProperty) {
-    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;
-  }
-
   /**
    * 删除实体索引
    * @param name 实体索引名称
@@ -545,41 +496,22 @@ export class Entity extends BaseNode {
     return entityIndex.delete();
   }
 
-  __removeEntityIndex(entityIndex: EntityIndex) {
-    const parentKey = entityIndex.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: entityIndex,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = entityIndex.__v_raw || entityIndex;
-      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;
+  }
+  /**
+   * 祖先 DataSource
+   */
+  get dataSource() {
+    return this.getAncestor('DataSource') as DataSource;
+  }
 
   getPropertyExistingColumnNames(excludedList: Array<EntityProperty> = []) {
     const excludedSet = new Set(excludedList);