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

package/src/concepts/QuerySelectExpression__.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 QueryAggregateExpression from './QueryAggregateExpression__';
@@ -70,7 +71,7 @@ export class QuerySelectExpression extends LogicItem {
 
         getQueryAggregateExpressionExistingNames(excludedList: Array<QueryAggregateExpression> = []) {
         const excludedSet = new Set(excludedList);
-        return this.selectElements.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.selectElements || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getQueryAggregateExpressionUniqueName(name = 'queryAggregateExpression1') {
         return utils.unique(name, this.getQueryAggregateExpressionExistingNames());

package/src/concepts/Rect__.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';
 

package/src/concepts/Return__.ts

@@ -14,6 +14,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__';
@@ -271,7 +272,7 @@ export class Return extends BaseNode {
         const object = {
             typeAnnotation,
             // 处理下拉属性
-            completionChildren: this.getSelectRef(),
+            // completionChildren: this.getSelectRef(),
         };
 
         return this.update({
@@ -293,7 +294,7 @@ export class Return extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
+    get readonly() {
         return !!this.module;
     }
 

package/src/concepts/Role__.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 App from './App__';
@@ -29,6 +30,12 @@ export class Role extends BaseNode {
     @property()
     name: string = undefined;
 
+    /**
+     * 唯一标识
+     */
+    @property()
+    uuid: string = uuidv4().replace(/-/g, '');
+
     /**
      * 角色描述
      */
@@ -89,13 +96,23 @@ export class Role extends BaseNode {
     //================================================================================
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = `export enum ${this.name} {\n`;
-        code += `      ${this.name}='${this.name}'\n`;
+        let code = `export enum ${this.tsName} {\n`;
+        code += `      ${this.tsName}='${this.tsName}'\n`;
         code += indent(state.tabSize) + '}\n';
 
         return code;
     }
 
+    get tsName() {
+        let tsName = this.name;
+        if (/^\d/.test(tsName)) {
+            tsName = '$' + tsName;
+        }
+        // 匹配所有特殊字符都转为_
+        tsName = tsName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '_');
+        return tsName;
+    }
+
     getNamespace() {
         if (this.parentNode && (this.parentNode as Namespace).getNamespace)
             return `${(this.parentNode as Namespace).getNamespace()}.roles`;

package/src/concepts/Slot__.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 ViewComponent from './ViewComponent__';

package/src/concepts/SqlQueryComponent__.ts

@@ -1,3 +1,4 @@
+import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -6,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 TypeAnnotation from './TypeAnnotation__';
@@ -124,7 +126,15 @@ export class SqlQueryComponent extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
+    @withSourceMap()
+    toEmbeddedTS(state?: TranslatorState): string {
+        let code = `(function(): nasl.collection.PageOf<`
+        code +=`${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS(shiftState(state, code)): 'unknown'}> {\n`;
+        code += '\n';
+        code += indent(state.tabSize + 1) + 'return;\n';
+        code += indent(state.tabSize) + '})();\n';
+        return code;
+    }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Start__.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/StringLiteral__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -7,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 LogicItem from './LogicItem__';
@@ -54,7 +56,7 @@ export class StringLiteral extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         let code = '';
         if (this.value) {
             if (!this.value.includes("'"))

package/src/concepts/StructureProperty__.ts

@@ -11,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__';
@@ -288,7 +289,7 @@ export class StructureProperty extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
+    get readonly() {
         return !!this.module;
     }
 

package/src/concepts/Structure__.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 TypeParam from './TypeParam__';
@@ -114,7 +115,7 @@ export class Structure extends BaseNode {
 
         getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
-        return this.typeParams.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.typeParams || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getTypeParamUniqueName(name = 'typeParam1') {
         return utils.unique(name, this.getTypeParamExistingNames());
@@ -256,7 +257,7 @@ export class Structure extends BaseNode {
 
     getPropertyExistingNames(excludedList: Array<StructureProperty> = []) {
         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);
     }
     getPropertyUniqueName(name = 'property1') {
         return utils.unique(name, this.getPropertyExistingNames());
@@ -504,7 +505,7 @@ export class Structure extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
+    get readonly() {
         return !!this.module;
     }
 
@@ -525,7 +526,7 @@ export class Structure extends BaseNode {
 
     getNamespace() {
         if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
-            return this.module ? `${(this.parentNode as Module).getNamespaceAndKey()}.structures` : `${(this.parentNode as Namespace).getNamespace()}.structures`;
+            return `${(this.parentNode as Namespace).getNamespace()}.structures`;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }

package/src/concepts/SwitchCase__.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/SwitchStatement__.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 SwitchCase from './SwitchCase__';

package/src/concepts/Theme__.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';
 

package/src/concepts/Transactional__.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 Logic from './Logic__';

package/src/concepts/TypeAnnotation__.ts

@@ -22,6 +22,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';
 
@@ -311,6 +312,9 @@ export class TypeAnnotation extends BaseNode {
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
+            if (this.typeKind === 'reference' && this.typeNamespace.endsWith('enums')) {
+                return `ReturnType<typeof ${this.typeNamespace}.${this.typeName}.toList>`;
+            }
             return `${this.typeNamespace}.${this.typeName}`;
         } else if (this.typeKind === 'generic') {
             let code = `${this.typeNamespace}.${this.typeName}<`;

package/src/concepts/TypeParam__.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';
 

package/src/concepts/UnaryExpression__.ts

@@ -1,4 +1,6 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -7,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 LogicItem from './LogicItem__';
@@ -122,11 +125,11 @@ export class UnaryExpression extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         if (this.operator === 'isNull') {
-            return this.argument.toVue(state);
+            return this.argument.toVue(options);
         } else {
-            return '!' + this.argument.toVue(state);
+            return '!' + this.argument.toVue(options);
         }
     }
 

package/src/concepts/Unparsed__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -7,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 LogicItem from './LogicItem__';
@@ -65,7 +67,7 @@ export class Unparsed extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         return this.code ? ` ${this.code} ` : '';
     }
 

package/src/concepts/UseComponent__.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';
 

package/src/concepts/ValidationRule__.ts

@@ -1,5 +1,7 @@
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 import Function from './Function__';
+import { ElementToVueOptions } from './ViewElement__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -8,6 +10,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__';
@@ -213,12 +216,12 @@ export class ValidationRule extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         let code = this.calleeName;
         if (this.arguments.length) {
             code += '(';
             this.arguments.forEach((arg, index) => {
-                code += arg.toVue(shiftState(state, code));
+                code += arg.toVue(options);
                 if (index !== this.arguments.length - 1)
                     code += ', ';
             });

package/src/concepts/Variable__.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__';
@@ -153,10 +155,14 @@ export class Variable extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
-     * 删除类型标注
-     * @param name 类型标注名称
-     */
+    * 删除类型标注
+    * @param name 类型标注名称
+    */
     removeTypeAnnotation(name: string): void;
 
     /**
@@ -205,7 +211,7 @@ export class Variable extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         return this.name;
     }
 
@@ -274,7 +280,7 @@ export class Variable extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
+    get readonly() {
         return !!this.module;
     }
 
@@ -304,7 +310,7 @@ export class Variable extends BaseNode {
     //================================================================================
 }
 
-classMap.Variable = Variable;
+classMap['Variable'] = Variable;
 export default Variable;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ViewComponent__.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 Attribute from './Attribute__';
@@ -121,7 +122,7 @@ export class ViewComponent extends BaseNode {
 
         getAttributeExistingNames(excludedList: Array<Attribute> = []) {
         const excludedSet = new Set(excludedList);
-        return this.attrs.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.attrs || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getAttributeUniqueName(name = 'attribute1') {
         return utils.unique(name, this.getAttributeExistingNames());
@@ -263,7 +264,7 @@ export class ViewComponent extends BaseNode {
 
     getEventExistingNames(excludedList: Array<Event> = []) {
         const excludedSet = new Set(excludedList);
-        return this.events.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.events || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEventUniqueName(name = 'event1') {
         return utils.unique(name, this.getEventExistingNames());
@@ -405,7 +406,7 @@ export class ViewComponent extends BaseNode {
 
     getSlotExistingNames(excludedList: Array<Slot> = []) {
         const excludedSet = new Set(excludedList);
-        return this.slots.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.slots || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getSlotUniqueName(name = 'slot1') {
         return utils.unique(name, this.getSlotExistingNames());
@@ -547,7 +548,7 @@ export class ViewComponent extends BaseNode {
 
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
-        return this.methods.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.methods || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames());
@@ -689,7 +690,7 @@ export class ViewComponent extends BaseNode {
 
     getViewComponentExistingNames(excludedList: Array<ViewComponent> = []) {
         const excludedSet = new Set(excludedList);
-        return this.children.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.children || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewComponentUniqueName(name = 'viewComponent1') {
         return utils.unique(name, this.getViewComponentExistingNames());