@lcap/nasl 1.0.0-alpha → 1.0.0-alpha.3

package/src/concepts/Entity__.ts

@@ -9,6 +9,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } 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__';
@@ -33,6 +34,12 @@ export class Entity extends BaseNode {
     @property()
     name: string = undefined;
 
+    /**
+     * 唯一标识
+     */
+    @property()
+    uuid: string = uuidv4().replace(/-/g, '');
+
     /**
      * 数据库表名
      */
@@ -125,12 +132,12 @@ export class Entity extends BaseNode {
         });
     }
 
-        getEntityPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
+        getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
         const excludedSet = new Set(excludedList);
-        return this.properties.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.properties || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
-    getEntityPropertyUniqueName(name = 'entityProperty1') {
-        return utils.unique(name, this.getEntityPropertyExistingNames());
+    getPropertyUniqueName(name = 'property1') {
+        return utils.unique(name, this.getPropertyExistingNames());
     }
 
     /**
@@ -138,70 +145,70 @@ export class Entity extends BaseNode {
     * @internal
     * @param name 实体字段名称，如果不填会自动生成一个唯一名称
     */
-    _insertEntityPropertyAt(name: string, index: number): EntityProperty;
+    _insertPropertyAt(name: string, index: number): EntityProperty;
 
     /**
     * 插入实体字段
     * @internal
-    * @param entityPropertyOptions 实体字段参数
+    * @param propertyOptions 实体字段参数
     */
-    _insertEntityPropertyAt(entityPropertyOptions: Partial<EntityProperty>, index: number): EntityProperty;
+    _insertPropertyAt(propertyOptions: Partial<EntityProperty>, index: number): EntityProperty;
 
     /**
     * 插入实体字段
     * @internal
-    * @param entityProperty 已有的实体字段实例
+    * @param property 已有的实体字段实例
     */
-    _insertEntityPropertyAt(entityProperty: EntityProperty, index: number): EntityProperty;
+    _insertPropertyAt(property: EntityProperty, index: number): EntityProperty;
 
-    _insertEntityPropertyAt(options: string | Partial<EntityProperty> | EntityProperty, index: number) {
-        const entityPropertyOptions: any = {};
+    _insertPropertyAt(options: string | Partial<EntityProperty> | EntityProperty, index: number) {
+        const propertyOptions: any = {};
         const relationOptions = { parentNode: this, parentKey: 'properties' };
-        let entityProperty: EntityProperty;
+        let property: EntityProperty;
         if (!options) {
-            entityProperty = EntityProperty.from({
-                ...entityPropertyOptions,
-                name: this.getEntityPropertyUniqueName(),
-            }, this);
+            property = EntityProperty.from({
+                ...propertyOptions,
+                name: this.getPropertyUniqueName(),
+            }, this, 'properties');
         } else if (typeof options === 'string') {
-            entityProperty = EntityProperty.from({
-                ...entityPropertyOptions,
+            property = EntityProperty.from({
+                ...propertyOptions,
                 name: options,
-            }, this);
+            }, this, 'properties');
         } else if (options instanceof EntityProperty) {
             options.delete(); // 同一实例不支持多处存在
-            entityProperty = options;
+            property = options;
+            Object.assign(property, relationOptions);
         } else {
-            entityProperty = EntityProperty.from({
-                ...entityPropertyOptions,
+            property = EntityProperty.from({
+                ...propertyOptions,
                 ...options,
-            }, this);
+            }, this, 'properties');
         }
-        Object.assign(entityProperty, relationOptions);
-        this.properties.splice(index, 0, entityProperty);
-        return entityProperty;
+        this.properties.splice(index, 0, property);
+        return property;
     }
 
     /**
      * 插入实体字段
      * @param name 实体字段名称，如果不填会自动生成一个唯一名称
      */
-    insertEntityPropertyAt(name: string, index: number): EntityProperty;
+    insertPropertyAt(name: string, index: number): EntityProperty;
 
     /**
      * 插入实体字段
-     * @param entityPropertyOptions 实体字段参数
+     * @param propertyOptions 实体字段参数
      */
-    insertEntityPropertyAt(entityPropertyOptions: Partial<EntityProperty>, index: number): EntityProperty;
+    insertPropertyAt(propertyOptions: Partial<EntityProperty>, index: number): EntityProperty;
 
     /**
      * 插入实体字段
-     * @param entityProperty 已有的实体字段实例
+     * @param property 已有的实体字段实例
      */
-    insertEntityPropertyAt(entityProperty: EntityProperty, index: number): EntityProperty;
+    insertPropertyAt(property: EntityProperty, index: number): EntityProperty;
 
-    insertEntityPropertyAt(options: string | Partial<EntityProperty> | EntityProperty, index: number) {
-        const node = this._insertEntityPropertyAt(options as any, index);
+    insertPropertyAt(options: string | Partial<EntityProperty> | EntityProperty, index: number) {
+        const node = this._insertPropertyAt(options as any, index);
         node.create({
             index,
             parentNode: this,
@@ -215,25 +222,25 @@ export class Entity extends BaseNode {
      * @internal
      * @param name 实体字段名称，如果不填会自动生成一个唯一名称
      */
-    _addEntityProperty(name?: string): EntityProperty;
+    _addProperty(name?: string): EntityProperty;
 
     /**
      * 添加实体字段
      * @internal
-     * @param entityPropertyOptions 实体字段参数
+     * @param propertyOptions 实体字段参数
      */
-    _addEntityProperty(entityPropertyOptions: Partial<EntityProperty>): EntityProperty;
+    _addProperty(propertyOptions: Partial<EntityProperty>): EntityProperty;
 
     /**
      * 添加实体字段
      * @internal
-     * @param entityProperty 已有的实体字段实例
+     * @param property 已有的实体字段实例
      */
-    _addEntityProperty(entityProperty: EntityProperty): EntityProperty;
+    _addProperty(property: EntityProperty): EntityProperty;
 
-    _addEntityProperty(options?: string | Partial<EntityProperty> | EntityProperty) {
+    _addProperty(options?: string | Partial<EntityProperty> | EntityProperty) {
         const index = this.properties.length;
-        return this._insertEntityPropertyAt(options as any, index);
+        return this._insertPropertyAt(options as any, index);
     }
 
     /**
@@ -241,22 +248,22 @@ export class Entity extends BaseNode {
      * @internal
      * @param name 实体字段名称，如果不填会自动生成一个唯一名称
      */
-    addEntityProperty(name?: string): EntityProperty;
+    addProperty(name?: string): EntityProperty;
 
     /**
      * 添加实体字段
-     * @param entityPropertyOptions 实体字段参数
+     * @param propertyOptions 实体字段参数
      */
-    addEntityProperty(entityPropertyOptions: Partial<EntityProperty>): EntityProperty;
+    addProperty(propertyOptions: Partial<EntityProperty>): EntityProperty;
 
     /**
      * 添加实体字段
-     * @param entityProperty 已有的实体字段实例
+     * @param property 已有的实体字段实例
      */
-    addEntityProperty(entityProperty: EntityProperty): EntityProperty;
+    addProperty(property: EntityProperty): EntityProperty;
 
-    addEntityProperty(options?: string | Partial<EntityProperty> | EntityProperty) {
-        const node = this._addEntityProperty(options as any);
+    addProperty(options?: string | Partial<EntityProperty> | EntityProperty) {
+        const node = this._addProperty(options as any);
         const index = this.properties.length;
         node.create({
             index,
@@ -269,7 +276,7 @@ export class Entity extends BaseNode {
 
     getEntityIndexExistingNames(excludedList: Array<EntityIndex> = []) {
         const excludedSet = new Set(excludedList);
-        return this.indexes.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.indexes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEntityIndexUniqueName(name = 'entityIndex1') {
         return utils.unique(name, this.getEntityIndexExistingNames());
@@ -304,22 +311,22 @@ export class Entity extends BaseNode {
             entityIndex = EntityIndex.from({
                 ...entityIndexOptions,
                 name: this.getEntityIndexUniqueName(),
-            }, this);
+            }, this, 'indexes');
         } else if (typeof options === 'string') {
             entityIndex = EntityIndex.from({
                 ...entityIndexOptions,
                 name: options,
-            }, this);
+            }, this, 'indexes');
         } else if (options instanceof EntityIndex) {
             options.delete(); // 同一实例不支持多处存在
             entityIndex = options;
+            Object.assign(entityIndex, relationOptions);
         } else {
             entityIndex = EntityIndex.from({
                 ...entityIndexOptions,
                 ...options,
-            }, this);
+            }, this, 'indexes');
         }
-        Object.assign(entityIndex, relationOptions);
         this.indexes.splice(index, 0, entityIndex);
         return entityIndex;
     }
@@ -415,43 +422,43 @@ export class Entity extends BaseNode {
     * 删除实体字段
     * @param name 实体字段名称
     */
-    removeEntityProperty(name: string): void;
+    removeProperty(name: string): void;
 
     /**
      * 删除实体字段
-     * @param entityProperty 已有的实体字段实例
+     * @param property 已有的实体字段实例
      */
-    removeEntityProperty(entityProperty: EntityProperty): void;
+    removeProperty(property: EntityProperty): void;
 
-    removeEntityProperty(options: string | EntityProperty) {
-        let entityProperty: EntityProperty;
+    removeProperty(options: string | EntityProperty) {
+        let property: EntityProperty;
         if (typeof options === 'string') {
-            entityProperty = this.properties.find((item) => item.name === options);
-            if (!entityProperty) {
+            property = this.properties.find((item) => item.name === options);
+            if (!property) {
                 throw new Error('找不到实体字段 ' + options);
             }
         } else {
-            entityProperty = options;
+            property = options;
         }
-        return entityProperty.delete();
+        return property.delete();
     }
 
-    __removeEntityProperty(entityProperty: EntityProperty) {
-        const parentKey = entityProperty.parentKey;
+    __removeEntityProperty(property: EntityProperty) {
+        const parentKey = property.parentKey;
         const params: Params = {
             parentNode: this,
             parentKey,
             index: -1,
             object: null,
-            oldObject: entityProperty,
+            oldObject: property,
         };
         if (parentKey) {
             params.parentKey = parentKey;
             if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(entityProperty);
+                const index = (this as any)[parentKey].indexOf(property);
                 ~index && (this as any)[parentKey].splice(index, 1);
                 params.index = index;
-            } else if ((this as any)[parentKey] === entityProperty) {
+            } else if ((this as any)[parentKey] === property) {
                 params.index = 0;
                 (this as any)[parentKey] = undefined;
             }
@@ -513,6 +520,17 @@ export class Entity extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    /**
+     * 设置实体表名
+     */
+    setTableName(tableName: string) {
+        const object = {
+            tableName,
+        };
+        this.update({
+            ...object,
+        });
+    }
 
     public static getDefaultOptions() {
         return {
@@ -635,6 +653,13 @@ export class Entity extends BaseNode {
             code += indent(state.tabSize) + `\n            ];\n        }\n`;
         }
 
+        const ns = this.ns;
+        code += `\nstatic logics = {\n`;
+        ns.logics.forEach((logic) => {
+            code += indent(state.tabSize + 1);
+            code += logic.toEmbeddedTS(shiftState(state, code), 'inObject');
+        });
+        code += '}\n';
         code += indent(state.tabSize) + '}\n';
 
         return code;
@@ -655,7 +680,11 @@ export class Entity extends BaseNode {
         return `/embedded/${this.app.name}/entities/${name}.ts`;
     }
 
-    ns: Namespace;
+    get ns() {
+        const ns = entity2LogicNamespace(this);
+        ns.path = this.getNamespace() + '.' + ns.name;
+        return ns;
+    }
 
     toEmbeddedTSFile() {
         let code = `namespace ${this.getNamespace()} {\n`;
@@ -665,15 +694,6 @@ export class Entity extends BaseNode {
         code += this.toEmbeddedTS(state);
         code += '}\n';
 
-        const ns = entity2LogicNamespace(this);
-        this.ns = ns;
-        ns.path = this.getNamespace().replace(/\.entities$/, '.logics') + '.' + ns.name;
-        code += `\nnamespace ${ns.path} {\n`;
-        ns.logics.forEach((logic) => {
-            code += logic.toEmbeddedTS(shiftState(state, code)) + '\n';
-        });
-        code += '}\n';
-
         return {
             code,
             filePath: this.getEmbeddedFilePath(),

package/src/concepts/EnumItem__.ts

@@ -8,6 +8,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import Enum from './Enum__';

package/src/concepts/Enum__.ts

@@ -9,6 +9,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import EnumItem from './EnumItem__';
@@ -149,13 +150,13 @@ export class Enum extends BaseNode {
         if (options instanceof EnumItem) {
             options.delete(); // 同一实例不支持多处存在
             enumItem = options;
+            Object.assign(enumItem, relationOptions);
         } else {
             enumItem = EnumItem.from({
                 ...enumItemOptions,
                 ...options,
-            }, this);
+            }, this, 'enumItems');
         }
-        Object.assign(enumItem, relationOptions);
         this.enumItems.splice(index, 0, enumItem);
         return enumItem;
     }
@@ -283,21 +284,27 @@ export class Enum extends BaseNode {
     toEmbeddedTS(state?: TranslatorState): string {
         let code = `export class ${this.name} {\n`;
         // 增加一个单独的标签
-        code += indent(state.tabSize + 1) + `__name: '${this.getNamespace()}.${this.name}';\n`;
+        code += indent(state.tabSize + 1) + `static __name: '${this.getNamespace()}.${this.name}';\n`;
         this.enumItems.forEach((property) => {
             code += indent(state.tabSize + 1);
             code += property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
             code += ';\n';
         });
+        code += `
+        static toList(): nasl.collection.List<{ text: string, value: string }> {
+            let value: nasl.collection.List<{ text: string, value: string }>
+            return value;
+        }
+        `;
         code += indent(state.tabSize) + '}\n';
 
         return code;
     }
 
     getNamespace() {
-        if (this.parentNode && (this.parentNode as Namespace).getNamespace)
+        if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
             return `${(this.parentNode as Namespace).getNamespace()}.enums`;
-        else
+        } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
 
@@ -306,7 +313,8 @@ export class Enum extends BaseNode {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name = this.name) {
-        return `/embedded/${this.app.name}/enums/${name}.ts`;
+        const _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
+        return `/embedded/${this.app.name}${_path}/enums/${name}.ts`;
     }
 
     toEmbeddedTSFile() {

package/src/concepts/Event__.ts

@@ -6,6 +6,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import Param from './Param__';
@@ -107,7 +108,7 @@ export class Event extends BaseNode {
 
         getParamExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
-        return this.params.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.params || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getParamExistingNames());
@@ -142,22 +143,22 @@ export class Event extends BaseNode {
             param = Param.from({
                 ...paramOptions,
                 name: this.getParamUniqueName(),
-            }, this);
+            }, this, 'params');
         } else if (typeof options === 'string') {
             param = Param.from({
                 ...paramOptions,
                 name: options,
-            }, this);
+            }, this, 'params');
         } else if (options instanceof Param) {
             options.delete(); // 同一实例不支持多处存在
             param = options;
+            Object.assign(param, relationOptions);
         } else {
             param = Param.from({
                 ...paramOptions,
                 ...options,
-            }, this);
+            }, this, 'params');
         }
-        Object.assign(param, relationOptions);
         this.params.splice(index, 0, param);
         return param;
     }