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

package/src/concepts/Constant__.ts

@@ -2,6 +2,7 @@ import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Entity from './Entity__';
 import Structure from './Structure__';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -10,6 +11,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 TypeAnnotation from './TypeAnnotation__';
@@ -209,7 +211,7 @@ export class Constant extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         return this.name;
     }
 

package/src/concepts/DataElement__.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 TypeAnnotation from './TypeAnnotation__';

package/src/concepts/Destination__.ts

@@ -1,5 +1,6 @@
 import View from './View__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -8,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 Argument from './Argument__';
@@ -236,7 +238,6 @@ export class Destination extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-
     get tsCalleeNamespace() {
         if (this.viewNamespace) {
             let tsCalleeNamespace = this.viewNamespace;
@@ -252,7 +253,8 @@ export class Destination extends LogicItem {
             if (/^\d/.test(tsName)) {
                 tsName = '$' + tsName;
             }
-            tsName = tsName.replaceAll('-', '_');
+            // 匹配所有特殊字符都转为_
+            tsName = tsName.replace(/\W/g, '_');
             return tsName;
         }
         return '';
@@ -266,7 +268,7 @@ export class Destination extends LogicItem {
         return viewArr;
     }
 
-    toVue() {
+    toVue(options?: ElementToVueOptions) {
         let url = '';
         const viewArr = this.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
@@ -342,7 +344,7 @@ export class Destination extends LogicItem {
         if (Array.isArray(namespaceAttr)) {
             namespaceAttr.forEach((item, index) => {
                 if (item === 'views') {
-                    viewNameAttr.push(namespaceAttr[index + 1]?.replace('View_', ''));
+                    viewNameAttr.push(namespaceAttr[index + 1]);
                 }
             });
         }
@@ -379,7 +381,7 @@ export class Destination extends LogicItem {
             }
             code += `${tab});\n`;
         }
-        code += `${indent(state.tabSize + 1)}}\n`
+        code += `${indent(state.tabSize + 1)}}\n`;
         return code;
     }
     //================================================================================

package/src/concepts/End__.ts

@@ -7,6 +7,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 LogicItem from './LogicItem__';

package/src/concepts/EntityIndex__.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 Entity from './Entity__';
@@ -32,6 +33,12 @@ export class EntityIndex extends BaseNode {
     @property()
     name: string = undefined;
 
+    /**
+     * 数据库索引名
+     */
+    @property()
+    indexName: string = undefined;
+
     /**
      * propertyNames
      */
@@ -106,6 +113,18 @@ export class EntityIndex extends BaseNode {
         });
     }
 
+    /**
+     * 设置数据库索引名
+     */
+    setIndexName(indexName: string) {
+        const object = {
+            indexName,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     /**
      * 设置propertyNames
      */

package/src/concepts/EntityProperty__.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 TypeAnnotation from './TypeAnnotation__';
@@ -33,6 +34,12 @@ export class EntityProperty extends BaseNode {
     @property()
     name: string = undefined;
 
+    /**
+     * 唯一标识
+     */
+    @property()
+    uuid: string = uuidv4().replace(/-/g, '');
+
     /**
      * 数据库列名
      */
@@ -99,12 +106,6 @@ export class EntityProperty extends BaseNode {
     @property()
     deleteRule: 'protect' | 'cascade' = undefined;
 
-    /**
-     * 是否可删除
-     */
-    @property()
-    deletable: boolean = undefined;
-
     /**
      * 显示方式
      */
@@ -490,8 +491,8 @@ export class EntityProperty extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
-        return !!this.module;
+    get readonly() {
+        return !!this.module || this.generationRule !== 'manual';
     }
 
     //================================================================================

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(),
+            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, 'properties');
         } else if (options instanceof EntityProperty) {
             options.delete(); // 同一实例不支持多处存在
-            entityProperty = options;
-            Object.assign(entityProperty, relationOptions);
+            property = options;
+            Object.assign(property, relationOptions);
         } else {
-            entityProperty = EntityProperty.from({
-                ...entityPropertyOptions,
+            property = EntityProperty.from({
+                ...propertyOptions,
                 ...options,
             }, this, 'properties');
         }
-        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());
@@ -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;
             }

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__';
@@ -124,18 +125,22 @@ export class Enum extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
-     * 插入枚举项
-     * @internal
-     * @param enumItemOptions 枚举项参数
-     */
+    * 插入枚举项
+    * @internal
+    * @param enumItemOptions 枚举项参数
+    */
     _insertEnumItemAt(enumItemOptions: Partial<EnumItem>, index: number): EnumItem;
 
     /**
-     * 插入枚举项
-     * @internal
-     * @param enumItem 已有的枚举项实例
-     */
+    * 插入枚举项
+    * @internal
+    * @param enumItem 已有的枚举项实例
+    */
     _insertEnumItemAt(enumItem: EnumItem, index: number): EnumItem;
 
     _insertEnumItemAt(options: Partial<EnumItem> | EnumItem, index: number) {
@@ -156,6 +161,8 @@ export class Enum extends BaseNode {
         return enumItem;
     }
 
+    
+
     /**
      * 插入枚举项
      * @param enumItemOptions 枚举项参数
@@ -178,6 +185,8 @@ export class Enum extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加枚举项
      * @internal
@@ -197,6 +206,8 @@ export class Enum extends BaseNode {
         return this._insertEnumItemAt(options as any, index);
     }
 
+    
+
     /**
      * 添加枚举项
      * @param enumItemOptions 枚举项参数
@@ -220,6 +231,9 @@ export class Enum extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
      * 删除枚举项
      * @param enumItem 已有的枚举项实例
@@ -227,7 +241,7 @@ export class Enum extends BaseNode {
     removeEnumItem(enumItem: EnumItem): void;
 
     removeEnumItem(options: EnumItem) {
-        const enumItem: EnumItem = options;
+        let enumItem: EnumItem = options;
         return enumItem.delete();
     }
 
@@ -270,12 +284,18 @@ 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;
@@ -283,7 +303,7 @@ export class Enum extends BaseNode {
 
     getNamespace() {
         if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
-            return this.module ? `${(this.parentNode as Module).getNamespaceAndKey()}.enums` : `${(this.parentNode as Namespace).getNamespace()}.enums`;
+            return `${(this.parentNode as Namespace).getNamespace()}.enums`;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
@@ -317,7 +337,7 @@ export class Enum extends BaseNode {
     //================================================================================
 }
 
-classMap.Enum = Enum;
+classMap['Enum'] = Enum;
 export default Enum;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

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());