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

package/src/concepts/EntityProperty__.ts

@@ -1,20 +1,19 @@
-import { v4 as uuidv4 } from 'uuid';
 import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
-import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import CallQueryComponent from './CallQueryComponent__';
-import StructureProperty from './StructureProperty__';
-import Structure from './Structure__';
-//= ===============================================================================
+
+type changeType = 'up' | 'down';
+
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 import DatabaseTypeAnnotation from './DatabaseTypeAnnotation__';
 import Entity from './Entity__';
@@ -22,24 +21,28 @@ import Module from './Module__';
 import App from './App__';
 import DataSource from './DataSource__';
 
-type changeType = 'up' | 'down';
-
 /**
  * 实体属性
  */
+@className
 @concept('实体属性')
+// @ts-ignore
 export class EntityProperty extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'EntityProperty';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'EntityProperty' = 'EntityProperty';
+  // @ts-ignore
+  readonly concept!: 'EntityProperty';
 
   /**
    * 实体属性名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * 唯一标识
@@ -51,73 +54,89 @@ export class EntityProperty extends BaseNode {
    * 数据库列名
    */
   @property()
-  columnName: string = undefined;
+  // @ts-ignore
+  columnName!: string;
 
   /**
    * 实体属性标题
    */
   @property()
-  label: string = undefined;
+  // @ts-ignore
+  label!: string;
 
   /**
    * 实体属性描述
    */
   @property()
-  description: string = undefined;
+  // @ts-ignore
+  description!: string;
 
   /**
    * 类型
    */
-  @property('TypeAnnotation')
-  typeAnnotation: TypeAnnotation = undefined;
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
+  // @ts-ignore
+  typeAnnotation!: TypeAnnotation;
 
   /**
    * 数据库存储类型
    */
-  @property('DatabaseTypeAnnotation')
-  databaseTypeAnnotation: DatabaseTypeAnnotation = undefined;
+  @property({
+    objectRef: 'DatabaseTypeAnnotation',
+  })
+  // @ts-ignore
+  databaseTypeAnnotation!: DatabaseTypeAnnotation;
 
   /**
    * 是否必填
    */
   @property()
-  required: boolean = undefined;
+  // @ts-ignore
+  required!: boolean;
 
   /**
    * 默认值
    */
   @property()
-  defaultValue: string = undefined;
+  // @ts-ignore
+  defaultValue!: string;
 
   /**
    * 当前属性是否为主键
    */
   @property()
-  primaryKey: boolean = undefined;
+  // @ts-ignore
+  primaryKey!: boolean;
 
   /**
    * 关联实体的命名空间
    */
   @property()
-  relationNamespace: string = undefined;
+  // @ts-ignore
+  relationNamespace!: string;
 
   /**
    * 关联实体
    */
   @property()
-  relationEntity: string = undefined;
+  // @ts-ignore
+  relationEntity!: string;
 
   /**
    * 关联属性
    */
   @property()
-  relationProperty: string = undefined;
+  // @ts-ignore
+  relationProperty!: string;
 
   /**
    * 关联属性实体记录删除规则
    */
   @property()
-  deleteRule: 'protect' | 'cascade' = undefined;
+  // @ts-ignore
+  deleteRule!: 'protect' | 'cascade';
 
   /**
    * 显示方式
@@ -133,7 +152,9 @@ export class EntityProperty extends BaseNode {
   /**
    * 验证规则
    */
-  @property()
+  @property({
+    isArray: true,
+  })
   rules: Array<string> = [];
 
   /**
@@ -146,7 +167,8 @@ export class EntityProperty extends BaseNode {
    * 表示 Oracle 主键自增时的序列名称
    */
   @property()
-  sequence: string = undefined;
+  // @ts-ignore
+  sequence!: string;
 
   /**
    * 祖先 Entity
@@ -154,21 +176,18 @@ export class EntityProperty extends BaseNode {
   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
    */
@@ -180,16 +199,11 @@ export class EntityProperty extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<EntityProperty>) {
-    // @ts-ignore
-    source = { ...EntityProperty.getDefaultOptions(), ...source };
+    source = Object.assign({}, EntityProperty.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'EntityProperty';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): EntityProperty {
     return super.from(source, parentNode, parentKey) as EntityProperty;
   }
@@ -205,7 +219,6 @@ export class EntityProperty extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置实体属性标题
    */
@@ -310,7 +323,7 @@ export class EntityProperty extends BaseNode {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error(`找不到类型标注 ${options}`);
+        throw new Error('找不到类型标注 ' + options);
       }
     } else {
       typeAnnotation = options;
@@ -319,7 +332,7 @@ export class EntityProperty extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const { parentKey } = typeAnnotation;
+    const parentKey = typeAnnotation.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -358,7 +371,7 @@ export class EntityProperty extends BaseNode {
     if (typeof options === 'string') {
       databaseTypeAnnotation = this.databaseTypeAnnotation;
       if (!databaseTypeAnnotation) {
-        throw new Error(`找不到数据库存储类型 ${options}`);
+        throw new Error('找不到数据库存储类型 ' + options);
       }
     } else {
       databaseTypeAnnotation = options;
@@ -367,7 +380,7 @@ export class EntityProperty extends BaseNode {
   }
 
   __removeDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation) {
-    const { parentKey } = databaseTypeAnnotation;
+    const parentKey = databaseTypeAnnotation.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -389,10 +402,10 @@ export class EntityProperty extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   /**
    * 设置实体属性名称
@@ -405,7 +418,9 @@ export class EntityProperty extends BaseNode {
     // 列名为初始化时需赋值为属性名，同时需要与其他列名中去重
     if ((this as any).__columnNameInit === false) {
       delete (this as any).__columnNameInit;
-      const columnNames = (this.parentNode as Entity).properties.filter((item) => item !== this).map((item) => item.columnName);
+      const columnNames = (this.parentNode as Entity).properties
+        .filter((item) => item !== this)
+        .map((item) => item.columnName);
       const columnName = utils.unique(name, columnNames, undefined, false);
       object.columnName = columnName;
 
@@ -478,7 +493,7 @@ export class EntityProperty extends BaseNode {
     });
     callQueryComponents?.forEach((node) => {
       const targetField = node.select.selectFieldElements.find(
-        (item) => item.entityAsName === this.parentNode.name && item.propertyName === this.name
+        (item) => item.entityAsName === this.parentNode.name && item.propertyName === this.name,
       );
       if (targetField) {
         if (options.action === 'delete') {
@@ -542,14 +557,6 @@ export class EntityProperty extends BaseNode {
    * 此方法不会 update
    */
   __formatColumnName() {
-    const parentNode = this.parentNode as Entity;
-    if (parentNode.isIgnoreFormatTableAndColumnName()) {
-      // if (!this.columnName) {
-      //     this.columnName = this.name;
-      // }
-      return;
-    }
-
     const newColumnName = this.genFormatColumnName();
     if (newColumnName && (!this.columnName || (this.columnName && newColumnName !== this.columnName))) {
       this.columnName = newColumnName;
@@ -560,14 +567,6 @@ export class EntityProperty extends BaseNode {
    * 根据全局设置中的数据库命名规则，将 属性列名 重命名
    */
   formatColumnName() {
-    const parentNode = this.parentNode as Entity;
-    if (parentNode.isIgnoreFormatTableAndColumnName()) {
-      // if (!this.columnName) {
-      //     this.setColumnName(this.name);
-      // }
-      return;
-    }
-
     const newColumnName = this.genFormatColumnName();
     if (newColumnName && (!this.columnName || (this.columnName && newColumnName !== this.columnName))) {
       this.setColumnName(newColumnName);
@@ -694,7 +693,11 @@ export class EntityProperty extends BaseNode {
    */
 
   changeSort(arr: any[], index: number, type: changeType) {
-    arr.splice(type !== 'up' ? index : index - 1, 1, ...arr.splice(type !== 'up' ? index + 1 : index, 1, arr[type !== 'up' ? index : index - 1]));
+    arr.splice(
+      type !== 'up' ? index : index - 1,
+      1,
+      ...arr.splice(type !== 'up' ? index + 1 : index, 1, arr[type !== 'up' ? index : index - 1]),
+    );
     return arr;
   }
 
@@ -851,15 +854,14 @@ export class EntityProperty extends BaseNode {
 
   __showAdvanced: boolean = false;
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.EntityProperty = EntityProperty;
 export default EntityProperty;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/Entity__.ts

@@ -1,18 +1,17 @@
-import { v4 as uuidv4 } from 'uuid';
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
 import CallQueryComponent from './CallQueryComponent__';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import EntityProperty from './EntityProperty__';
 import EntityIndex from './EntityIndex__';
 import Module from './Module__';
@@ -22,19 +21,25 @@ import App from './App__';
 /**
  * 实体
  */
+@className
 @concept('实体')
+// @ts-ignore
 export class Entity extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'Entity';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'Entity' = 'Entity';
+  // @ts-ignore
+  readonly concept!: 'Entity';
 
   /**
    * 实体名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * 唯一标识
@@ -46,13 +51,15 @@ export class Entity extends BaseNode {
    * 数据库表名
    */
   @property()
-  tableName: string = undefined;
+  // @ts-ignore
+  tableName!: string;
 
   /**
    * 实体描述
    */
   @property()
-  description: string = undefined;
+  // @ts-ignore
+  description!: string;
 
   /**
    * 实体来源
@@ -63,13 +70,19 @@ export class Entity extends BaseNode {
   /**
    * 实体属性列表
    */
-  @property('EntityProperty')
+  @property({
+    objectRef: 'EntityProperty',
+    isArray: true,
+  })
   properties: Array<EntityProperty> = [];
 
   /**
    * 实体索引列表
    */
-  @property('EntityIndex')
+  @property({
+    objectRef: 'EntityIndex',
+    isArray: true,
+  })
   indexes: Array<EntityIndex> = [];
 
   /**
@@ -78,14 +91,12 @@ export class Entity extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
-
   /**
    * 祖先 App
    */
   get app() {
     return this.getAncestor('App') as App;
   }
-
   /**
    * 祖先 DataSource
    */
@@ -97,16 +108,11 @@ export class Entity extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Entity>) {
-    // @ts-ignore
-    source = { ...Entity.getDefaultOptions(), ...source };
+    source = Object.assign({}, Entity.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'Entity';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): Entity {
     return super.from(source, parentNode, parentKey) as Entity;
   }
@@ -122,7 +128,6 @@ export class Entity extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置实体描述
    */
@@ -137,9 +142,10 @@ export class Entity extends BaseNode {
 
   getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.properties as EntityProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.properties as EntityProperty[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-
   getPropertyUniqueName(name = 'property1') {
     return utils.unique(name, this.getPropertyExistingNames(), undefined, false);
   }
@@ -176,7 +182,7 @@ export class Entity extends BaseNode {
           name: this.getPropertyUniqueName(),
         },
         this,
-        'properties'
+        'properties',
       );
     } else if (typeof options === 'string') {
       property = EntityProperty.from(
@@ -185,7 +191,7 @@ export class Entity extends BaseNode {
           name: options,
         },
         this,
-        'properties'
+        'properties',
       );
     } else if (options instanceof EntityProperty) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -198,7 +204,7 @@ export class Entity extends BaseNode {
           ...options,
         },
         this,
-        'properties'
+        'properties',
       );
     }
     this.properties.splice(index, 0, property);
@@ -293,7 +299,6 @@ export class Entity extends BaseNode {
     const excludedSet = new Set(excludedList);
     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);
   }
@@ -330,7 +335,7 @@ export class Entity extends BaseNode {
           name: this.getEntityIndexUniqueName(),
         },
         this,
-        'indexes'
+        'indexes',
       );
     } else if (typeof options === 'string') {
       entityIndex = EntityIndex.from(
@@ -339,7 +344,7 @@ export class Entity extends BaseNode {
           name: options,
         },
         this,
-        'indexes'
+        'indexes',
       );
     } else if (options instanceof EntityIndex) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -352,7 +357,7 @@ export class Entity extends BaseNode {
           ...options,
         },
         this,
-        'indexes'
+        'indexes',
       );
     }
     this.indexes.splice(index, 0, entityIndex);
@@ -460,7 +465,7 @@ export class Entity extends BaseNode {
     if (typeof options === 'string') {
       property = (this.properties as EntityProperty[]).find((item) => item.name === options);
       if (!property) {
-        throw new Error(`找不到实体属性 ${options}`);
+        throw new Error('找不到实体属性 ' + options);
       }
     } else {
       property = options;
@@ -469,7 +474,7 @@ export class Entity extends BaseNode {
   }
 
   __removeEntityProperty(property: EntityProperty) {
-    const { parentKey } = property;
+    const parentKey = property.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -508,7 +513,7 @@ export class Entity extends BaseNode {
     if (typeof options === 'string') {
       entityIndex = (this.indexes as EntityIndex[]).find((item) => item.name === options);
       if (!entityIndex) {
-        throw new Error(`找不到实体索引 ${options}`);
+        throw new Error('找不到实体索引 ' + options);
       }
     } else {
       entityIndex = options;
@@ -517,7 +522,7 @@ export class Entity extends BaseNode {
   }
 
   __removeEntityIndex(entityIndex: EntityIndex) {
-    const { parentKey } = entityIndex;
+    const parentKey = entityIndex.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -539,14 +544,16 @@ export class Entity extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   getPropertyExistingColumnNames(excludedList: Array<EntityProperty> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.properties as EntityProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.columnName);
+    return ((this.properties as EntityProperty[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.columnName);
   }
 
   getPropertyUniqueColumnName(name = 'property1', excludedList: Array<EntityProperty> = []) {
@@ -941,15 +948,14 @@ export class Entity extends BaseNode {
     const arr = this.getEntityIndexExistingNames(excludedList);
     return [...arr, 'primaryIndex'];
   }
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.Entity = Entity;
 export default Entity;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================