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

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__';
@@ -225,12 +226,9 @@ export class Return extends BaseNode {
      */
     completionChildren: Array<EntityProperty | StructureProperty> = undefined;
 
-    toUI(state?: TranslatorState): string {
-        return this.name;
-    }
-
     toJS(state?: TranslatorState): string {
-        return this.name;
+        const scope = this.view ? 'this' : 'Vue.prototype';
+        return `${this.name} = ${scope}.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, ${JSON.stringify(this.defaultValue)})`;
     }
 
     @withSourceMap()
@@ -274,7 +272,7 @@ export class Return extends BaseNode {
         const object = {
             typeAnnotation,
             // 处理下拉属性
-            completionChildren: this.getSelectRef(),
+            // completionChildren: this.getSelectRef(),
         };
 
         return this.update({
@@ -296,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__';
@@ -22,12 +24,6 @@ export class SqlQueryComponent extends LogicItem {
     @property()
     concept: 'SqlQueryComponent' = 'SqlQueryComponent';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * SQL 查询标题
      */
@@ -130,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__';
@@ -22,12 +23,6 @@ export class Start extends LogicItem {
     @property()
     concept: 'Start' = 'Start';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * 开始节点标题
      */
@@ -60,13 +55,11 @@ export class Start extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toUI(state?: TranslatorState): string {
-        return '';
-    }
 
     toJS(state?: TranslatorState): string {
         return '';
     }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         return '';

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__';
@@ -22,12 +24,6 @@ export class StringLiteral extends LogicItem {
     @property()
     concept: 'StringLiteral' = 'StringLiteral';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * 字面量的值
      */
@@ -60,7 +56,22 @@ export class StringLiteral extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toUI(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions): string {
+        let code = '';
+        if (this.value) {
+            if (!this.value.includes("'"))
+                code += `'${this.value}'`;
+            else if (!this.value.includes('"'))
+                code += `"${this.value}"`;
+            else if (!this.value.includes('`'))
+                code += `\`${this.value}\``;
+            else
+                code += `'${this.value.replace(/'/g, "\\'")}'`;
+        }
+        return code;
+    }
+
+    toUI(): string {
         let code = '';
         if (this.value) {
             if (!this.value.includes("'"))
@@ -75,7 +86,7 @@ export class StringLiteral extends LogicItem {
         return code;
     }
 
-    toJS(state?: TranslatorState): string {
+    toJS(): 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());
@@ -149,22 +150,22 @@ export class Structure extends BaseNode {
             typeParam = TypeParam.from({
                 ...typeParamOptions,
                 name: this.getTypeParamUniqueName(),
-            }, this);
+            }, this, 'typeParams');
         } else if (typeof options === 'string') {
             typeParam = TypeParam.from({
                 ...typeParamOptions,
                 name: options,
-            }, this);
+            }, this, 'typeParams');
         } else if (options instanceof TypeParam) {
             options.delete(); // 同一实例不支持多处存在
             typeParam = options;
+            Object.assign(typeParam, relationOptions);
         } else {
             typeParam = TypeParam.from({
                 ...typeParamOptions,
                 ...options,
-            }, this);
+            }, this, 'typeParams');
         }
-        Object.assign(typeParam, relationOptions);
         this.typeParams.splice(index, 0, typeParam);
         return typeParam;
     }
@@ -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());
@@ -291,22 +292,22 @@ export class Structure extends BaseNode {
             property = StructureProperty.from({
                 ...propertyOptions,
                 name: this.getPropertyUniqueName(),
-            }, this);
+            }, this, 'properties');
         } else if (typeof options === 'string') {
             property = StructureProperty.from({
                 ...propertyOptions,
                 name: options,
-            }, this);
+            }, this, 'properties');
         } else if (options instanceof StructureProperty) {
             options.delete(); // 同一实例不支持多处存在
             property = options;
+            Object.assign(property, relationOptions);
         } else {
             property = StructureProperty.from({
                 ...propertyOptions,
                 ...options,
-            }, this);
+            }, this, 'properties');
         }
-        Object.assign(property, relationOptions);
         this.properties.splice(index, 0, property);
         return property;
     }
@@ -501,6 +502,13 @@ export class Structure extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    /**
+     * 是否可编辑
+     * */
+    get readonly() {
+        return !!this.module;
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = `export class ${this.name} {\n`;
@@ -517,9 +525,9 @@ export class Structure extends BaseNode {
     }
 
     getNamespace() {
-        if (this.parentNode && (this.parentNode as Namespace).getNamespace)
+        if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
             return `${(this.parentNode as Namespace).getNamespace()}.structures`;
-        else
+        } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
 
@@ -528,7 +536,8 @@ export class Structure extends BaseNode {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name = this.name) {
-        return `/embedded/${this.app.name}/structures/${name}.ts`;
+        const _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
+        return `/embedded/${this.app.name}${_path}/structures/${name}.ts`;
     }
 
     toEmbeddedTSFile() {

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__';
@@ -22,12 +23,6 @@ export class SwitchCase extends LogicItem {
     @property()
     concept: 'SwitchCase' = 'SwitchCase';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * 条件表达式
      */
@@ -96,13 +91,13 @@ export class SwitchCase extends LogicItem {
         if (options instanceof LogicItem) {
             options.delete(); // 同一实例不支持多处存在
             logicItem = options;
+            Object.assign(logicItem, relationOptions);
         } else {
             logicItem = LogicItem.from({
                 ...logicItemOptions,
                 ...options,
-            }, this);
+            }, this, 'consequent');
         }
-        Object.assign(logicItem, relationOptions);
         this.consequent.splice(index, 0, logicItem);
         return logicItem;
     }
@@ -245,39 +240,6 @@ export class SwitchCase extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toUI(state?: TranslatorState, isLast?: boolean): string {
-        let code = '';
-        if (!isLast) {
-            code = 'if (';
-            code += this.test ? this.test.toUI(shiftState(state, code, {
-                tabSize: 0,
-            })) : '';
-
-            code += ')) {\n';
-
-            if (Array.isArray(this.consequent)) {
-                this.consequent.forEach((logicItem) => {
-                    code
-                        += logicItem.toUI(shiftState(state, code, {
-                            tabSize: 0,
-                        })) + '\n';
-                });
-            }
-            code += '}\n';
-        } else {
-            code += 'else {\n';
-            if (Array.isArray(this.consequent)) {
-                this.consequent.forEach((logicItem) => {
-                    code
-                        += logicItem.toUI(shiftState(state, code, {
-                            tabSize: 0,
-                        })) + '\n';
-                });
-            }
-            code += '}\n';
-        }
-        return code;
-    }
 
     toJS(state?: TranslatorState, isLast?: boolean): string {
         let code = '';

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__';
@@ -24,12 +25,6 @@ export class SwitchStatement extends LogicItem {
     @property()
     concept: 'SwitchStatement' = 'SwitchStatement';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * 选择分支情况列表
      */
@@ -79,13 +74,13 @@ export class SwitchStatement extends LogicItem {
         if (options instanceof SwitchCase) {
             options.delete(); // 同一实例不支持多处存在
             switchCase = options;
+            Object.assign(switchCase, relationOptions);
         } else {
             switchCase = SwitchCase.from({
                 ...switchCaseOptions,
                 ...options,
-            }, this);
+            }, this, 'cases');
         }
-        Object.assign(switchCase, relationOptions);
         this.cases.splice(index, 0, switchCase);
         return 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';
 
@@ -117,13 +118,13 @@ export class TypeAnnotation extends BaseNode {
         if (options instanceof TypeAnnotation) {
             options.delete(); // 同一实例不支持多处存在
             typeAnnotation = options;
+            Object.assign(typeAnnotation, relationOptions);
         } else {
             typeAnnotation = TypeAnnotation.from({
                 ...typeAnnotationOptions,
                 ...options,
-            }, this);
+            }, this, 'typeArguments');
         }
-        Object.assign(typeAnnotation, relationOptions);
         this.typeArguments.splice(index, 0, typeAnnotation);
         return typeAnnotation;
     }
@@ -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__';
@@ -22,12 +25,6 @@ export class UnaryExpression extends LogicItem {
     @property()
     concept: 'UnaryExpression' = 'UnaryExpression';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * 参数
      */
@@ -128,6 +125,14 @@ export class UnaryExpression extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    toVue(options?: ElementToVueOptions) {
+        if (this.operator === 'isNull') {
+            return this.argument.toVue(options);
+        } else {
+            return '!' + this.argument.toVue(options);
+        }
+    }
+
     toUI(state?: TranslatorState): string {
         if (this.operator === 'isNull') {
             return this.argument.toUI(state);

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__';
@@ -22,12 +24,6 @@ export class Unparsed extends LogicItem {
     @property()
     concept: 'Unparsed' = 'Unparsed';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * 表达式代码
      */
@@ -71,16 +67,20 @@ export class Unparsed extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toUI(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions): string {
+        return this.code ? ` ${this.code} ` : '';
+    }
+
+    toUI(): string {
         return this.code ? ` ${this.code} ` : '';
     }
 
-    toJS(state?: TranslatorState): string {
+    toJS(): string {
         return this.code ? ` ${this.code} ` : '';
     }
 
     @withSourceMap()
-    toEmbeddedTS(state?: TranslatorState): string {
+    toEmbeddedTS(): string {
         return this.code ? ` ${this.code} ` : '__IDENTIFIER__';
     }
 

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';