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

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__';
@@ -14,7 +15,7 @@ import LogicItem from './LogicItem__';
 /**
  * 选择分支情况
  */
-@concept
+@concept('选择分支情况')
 export class SwitchCase extends 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__';
@@ -16,7 +17,7 @@ import LogicItem from './LogicItem__';
 /**
  * 选择分支
  */
-@concept
+@concept('选择分支')
 export class SwitchStatement extends LogicItem {
     /**
      * 产品概念
@@ -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';
 
@@ -13,7 +14,7 @@ import classMap from '../common/classMap';
 /**
  * 主题
  */
-@concept
+@concept('主题')
 export class Theme extends BaseNode {
     /**
      * 产品概念

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__';
@@ -18,7 +19,7 @@ import Process from './Process__';
 /**
  * 事务
  */
-@concept
+@concept('事务')
 export class Transactional extends BaseNode {
     /**
      * 产品概念

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';
 
@@ -29,7 +30,7 @@ import classMap from '../common/classMap';
 /**
  * 类型标注
  */
-@concept
+@concept('类型标注')
 export class TypeAnnotation extends BaseNode {
     /**
      * 产品概念
@@ -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;
     }
@@ -308,12 +309,25 @@ export class TypeAnnotation extends BaseNode {
         });
     }
 
+    get tsCalleeNamespace() {
+        if (this.typeNamespace) {
+            let tsCalleeNamespace = this.typeNamespace;
+            tsCalleeNamespace = tsCalleeNamespace.replace(/\.[0-9]/g, (m) => m.replace('.', '.$'));
+            tsCalleeNamespace = tsCalleeNamespace.replace(/-/g, '_');
+            return tsCalleeNamespace;
+        }
+        return '';
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
-            return `${this.typeNamespace}.${this.typeName}`;
+            if (this.typeKind === 'reference' && this.typeNamespace.endsWith('enums')) {
+                return `${this.tsCalleeNamespace}.${this.typeName}`;
+            }
+            return `${this.tsCalleeNamespace}.${this.typeName}`;
         } else if (this.typeKind === 'generic') {
-            let code = `${this.typeNamespace}.${this.typeName}<`;
+            let code = `${this.tsCalleeNamespace}.${this.typeName}<`;
             return code += `${(this.typeArguments || []).map((arg) => arg.toEmbeddedTS(shiftState(state, code, { inline: true })))}>`;
         } else {
             return 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';
 
@@ -13,7 +14,7 @@ import classMap from '../common/classMap';
 /**
  * 类型参数
  */
-@concept
+@concept('类型参数')
 export class TypeParam extends BaseNode {
     /**
      * 产品概念

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__';
@@ -14,7 +17,7 @@ import LogicItem from './LogicItem__';
 /**
  * 一元表达式
  */
-@concept
+@concept('一元表达式')
 export class UnaryExpression extends 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);
@@ -157,9 +162,9 @@ export class UnaryExpression extends LogicItem {
 
         let code = '';
         if (this.argument) {
-            code += `${this.operator}${this.argument}`;
+            code += `${this.operator}(${this.argument.toEmbeddedTS(shiftState(state, code))})`;
         } else {
-            code += `${this.operator}__IDENTIFIER__`;
+            code += `${this.operator}(__IDENTIFIER__)`;
         }
         return code;
     }

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__';
@@ -14,7 +16,7 @@ import LogicItem from './LogicItem__';
 /**
  * 未解析的
  */
-@concept
+@concept('未解析的')
 export class Unparsed extends LogicItem {
     /**
      * 产品概念
@@ -22,12 +24,6 @@ export class Unparsed extends LogicItem {
     @property()
     concept: 'Unparsed' = 'Unparsed';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * 表达式代码
      */
@@ -71,17 +67,21 @@ 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 {
-        return this.code ? ` ${this.code} ` : '__IDENTIFIER__';
+    toEmbeddedTS(): string {
+        return 'nasl.core.universalVariable';
     }
 
     //================================================================================

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';
 
@@ -13,7 +14,7 @@ import classMap from '../common/classMap';
 /**
  * IDE 中使用的编辑组件
  */
-@concept
+@concept('IDE 中使用的编辑组件')
 export class UseComponent extends BaseNode {
     /**
      * 产品概念

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__';
@@ -16,7 +19,7 @@ import LogicItem from './LogicItem__';
 /**
  * 验证规则
  */
-@concept
+@concept('验证规则')
 export class ValidationRule extends LogicItem {
     /**
      * 产品概念
@@ -24,12 +27,6 @@ export class ValidationRule extends LogicItem {
     @property()
     concept: 'ValidationRule' = 'ValidationRule';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * 验证规则标题
      */
@@ -97,13 +94,13 @@ export class ValidationRule extends LogicItem {
         if (options instanceof Argument) {
             options.delete(); // 同一实例不支持多处存在
             argument = options;
+            Object.assign(argument, relationOptions);
         } else {
             argument = Argument.from({
                 ...argumentOptions,
                 ...options,
-            }, this);
+            }, this, 'arguments');
         }
-        Object.assign(argument, relationOptions);
         this.arguments.splice(index, 0, argument);
         return argument;
     }
@@ -219,13 +216,26 @@ export class ValidationRule extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    toVue(options?: ElementToVueOptions) {
+        let code = this.calleeName;
+        if (this.arguments.length) {
+            code += '(';
+            this.arguments.forEach((arg, index) => {
+                code += arg.toVue(options);
+                if (index !== this.arguments.length - 1)
+                    code += ', ';
+            });
+            code += ')';
+        }
+        return code;
+    }
 
     toUI(state?: TranslatorState): string {
         let code = this.calleeName;
         if (this.arguments.length) {
             code += '(';
             this.arguments.forEach((arg, index) => {
-                code += arg.toUI();
+                code += arg.toUI(shiftState(state, code));
                 if (index !== this.arguments.length - 1)
                     code += ', ';
             });
@@ -239,7 +249,7 @@ export class ValidationRule extends LogicItem {
         if (this.arguments.length) {
             code += '(';
             this.arguments.forEach((arg, index) => {
-                code += arg.toJS();
+                code += arg.toJS(shiftState(state, code));
                 if (index !== this.arguments.length - 1)
                     code += ', ';
             });

package/src/concepts/Variable__.ts

@@ -2,6 +2,10 @@ import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Entity from './Entity__';
 import Structure from './Structure__';
+import { ElementToVueOptions } from './ViewElement__';
+import { getNodeByNodeCallee } from '../automate/engine/utils';
+import EntityProperty from './EntityProperty__';
+import StructureProperty from './StructureProperty__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -10,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__';
@@ -23,7 +28,7 @@ import Process from './Process__';
 /**
  * 局部变量
  */
-@concept
+@concept('局部变量')
 export class Variable extends BaseNode {
     /**
      * 产品概念
@@ -153,14 +158,10 @@ export class Variable extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
-    * 删除类型标注
-    * @param name 类型标注名称
-    */
+     * 删除类型标注
+     * @param name 类型标注名称
+     */
     removeTypeAnnotation(name: string): void;
 
     /**
@@ -209,15 +210,24 @@ export class Variable extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    /**
+     * 自动补全的字段列表
+     */
+    completionChildren: Array<EntityProperty | StructureProperty> = undefined;
 
-    toUI(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions): string {
         return this.name;
     }
 
-    toJS(state?: TranslatorState): string {
+    toUI(): string {
         return this.name;
     }
 
+    toJS(state?: TranslatorState): string {
+        const scope = this.view ? 'this' : 'Vue.prototype';
+        return `${this.name} = ${scope}.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, ${JSON.stringify(this.defaultValue)})`;
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = this.name;
@@ -251,6 +261,8 @@ export class Variable extends BaseNode {
             const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
             Object.assign(typeAnnotation, relationOptions);
         }
+        // 处理下拉属性
+        this.completionChildren = this.getSelectRef();
         const object = {
             typeAnnotation,
         };
@@ -274,24 +286,16 @@ export class Variable extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
+    get readonly() {
         return !!this.module;
     }
 
     getSelectRef() {
         const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
         let completionChildren;
         if (typeKind === 'reference') {
-            let type: 'entities' | 'structures';
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
-            } else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
-            }
-            const data = this.app.dependencies.find((item) => item.name === moduleNames[2]);
-            const properties = (data[type] as Array<Entity | Structure>).find((item) => item.name === typeName)?.properties;
+            const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+            const properties = node.properties || [];
             completionChildren = properties;
         } else {
             completionChildren = undefined;
@@ -304,7 +308,7 @@ export class Variable extends BaseNode {
     //================================================================================
 }
 
-classMap['Variable'] = Variable;
+classMap.Variable = Variable;
 export default Variable;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑