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

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__';
@@ -14,7 +15,7 @@ import LogicItem from './LogicItem__';
 /**
  * 查询选择子句
  */
-@concept
+@concept('查询选择子句')
 export class QuerySelectExpression extends LogicItem {
     /**
      * 产品概念
@@ -22,12 +23,6 @@ export class QuerySelectExpression extends LogicItem {
     @property()
     concept: 'QuerySelectExpression' = 'QuerySelectExpression';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * distinct
      */
@@ -76,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());
@@ -111,22 +106,22 @@ export class QuerySelectExpression extends LogicItem {
             queryAggregateExpression = QueryAggregateExpression.from({
                 ...queryAggregateExpressionOptions,
                 name: this.getQueryAggregateExpressionUniqueName(),
-            }, this);
+            }, this, 'selectElements');
         } else if (typeof options === 'string') {
             queryAggregateExpression = QueryAggregateExpression.from({
                 ...queryAggregateExpressionOptions,
                 name: options,
-            }, this);
+            }, this, 'selectElements');
         } else if (options instanceof QueryAggregateExpression) {
             options.delete(); // 同一实例不支持多处存在
             queryAggregateExpression = options;
+            Object.assign(queryAggregateExpression, relationOptions);
         } else {
             queryAggregateExpression = QueryAggregateExpression.from({
                 ...queryAggregateExpressionOptions,
                 ...options,
-            }, this);
+            }, this, 'selectElements');
         }
-        Object.assign(queryAggregateExpression, relationOptions);
         this.selectElements.splice(index, 0, queryAggregateExpression);
         return queryAggregateExpression;
     }

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';
 
@@ -13,7 +14,7 @@ import classMap from '../common/classMap';
 /**
  * 矩形信息
  */
-@concept
+@concept('矩形信息')
 export class Rect extends BaseNode {
     /**
      * 产品概念

package/src/concepts/Return__.ts

@@ -5,6 +5,7 @@ import Entity from './Entity__';
 import EntityProperty from './EntityProperty__';
 import Structure from './Structure__';
 import StructureProperty from './StructureProperty__';
+import { getNodeByNodeCallee } from '../automate/engine/utils';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -14,6 +15,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__';
@@ -27,7 +29,7 @@ import Process from './Process__';
 /**
  * 输出参数
  */
-@concept
+@concept('输出参数')
 export class Return extends BaseNode {
     /**
      * 产品概念
@@ -157,14 +159,10 @@ export class Return extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
-    * 删除类型标注
-    * @param name 类型标注名称
-    */
+     * 删除类型标注
+     * @param name 类型标注名称
+     */
     removeTypeAnnotation(name: string): void;
 
     /**
@@ -225,12 +223,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()
@@ -270,11 +265,10 @@ export class Return extends BaseNode {
             const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
             Object.assign(typeAnnotation, relationOptions);
         }
-
+        // 处理下拉属性
+        this.completionChildren = this.getSelectRef();
         const object = {
             typeAnnotation,
-            // 处理下拉属性
-            completionChildren: this.getSelectRef(),
         };
 
         return this.update({
@@ -296,24 +290,16 @@ export class Return 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;
@@ -326,7 +312,7 @@ export class Return extends BaseNode {
     //================================================================================
 }
 
-classMap['Return'] = Return;
+classMap.Return = Return;
 export default Return;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

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__';
@@ -15,7 +16,7 @@ import App from './App__';
 /**
  * 角色
  */
-@concept
+@concept('角色')
 export class Role extends BaseNode {
     /**
      * 产品概念
@@ -29,6 +30,18 @@ export class Role extends BaseNode {
     @property()
     name: string = undefined;
 
+    /**
+     * 唯一标识
+     */
+    @property()
+    uuid: string = uuidv4().replace(/-/g, '');
+
+    /**
+     * 创建时间
+     */
+    @property()
+    createdTime: string = undefined;
+
     /**
      * 角色描述
      */
@@ -89,13 +102,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__';
@@ -15,7 +16,7 @@ import App from './App__';
 /**
  * 插槽
  */
-@concept
+@concept('插槽')
 export class Slot extends BaseNode {
     /**
      * 产品概念

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__';
@@ -14,7 +16,7 @@ import LogicItem from './LogicItem__';
 /**
  * SQL 查询
  */
-@concept
+@concept('SQL 查询')
 export class SqlQueryComponent extends LogicItem {
     /**
      * 产品概念
@@ -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__';
@@ -14,7 +15,7 @@ import LogicItem from './LogicItem__';
 /**
  * 开始节点
  */
-@concept
+@concept('开始节点')
 export class Start extends 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__';
@@ -14,7 +16,7 @@ import LogicItem from './LogicItem__';
 /**
  * 字符串字面量
  */
-@concept
+@concept('字符串字面量')
 export class StringLiteral extends 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

@@ -2,6 +2,7 @@ import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import EntityProperty from './EntityProperty__';
 import Entity from './Entity__';
+import { getNodeByNodeCallee } from '../automate/engine/utils';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -11,6 +12,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__';
@@ -21,7 +23,7 @@ import App from './App__';
 /**
  * 数据结构字段
  */
-@concept
+@concept('数据结构字段')
 export class StructureProperty extends BaseNode {
     /**
      * 产品概念
@@ -169,14 +171,10 @@ export class StructureProperty extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
-    * 删除类型标注
-    * @param name 类型标注名称
-    */
+     * 删除类型标注
+     * @param name 类型标注名称
+     */
     removeTypeAnnotation(name: string): void;
 
     /**
@@ -288,24 +286,16 @@ export class StructureProperty 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;
@@ -319,7 +309,7 @@ export class StructureProperty extends BaseNode {
     //================================================================================
 }
 
-classMap['StructureProperty'] = StructureProperty;
+classMap.StructureProperty = StructureProperty;
 export default StructureProperty;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

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__';
@@ -18,7 +19,7 @@ import App from './App__';
 /**
  * 数据结构
  */
-@concept
+@concept('数据结构')
 export class Structure extends BaseNode {
     /**
      * 产品概念
@@ -38,6 +39,12 @@ export class Structure extends BaseNode {
     @property()
     description: string = undefined;
 
+    /**
+     * 编译器信息
+     */
+    @property()
+    compilerInfoMap: { java?: { packageName: string, className: string } } = undefined;
+
     /**
      * 类型参数列表
      */
@@ -114,7 +121,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 +156,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 +263,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 +298,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,11 +508,25 @@ export class Structure extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    /**
+     * 是否可编辑
+     * */
+    get readonly() {
+        return !!this.module;
+    }
+    /* 删除空数据模块 */
+    deleteLogincAndModule() {
+        this.delete();
+        if (this.module && this.module.interfaces.length === 0 && this.module.structures.length === 0) {
+            this.app.removeModuleInInterfaceDependencies(this.module);
+        }
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = `export class ${this.name} {\n`;
+        let code = `export class ${this.tsName} {\n`;
         code += indent(state.tabSize + 1);
-        code += `__name: '${this.getNamespace()}.${this.name}';\n`;
+        code += `__name: '${this.getNamespace()}.${this.tsName}';\n`;
         this.properties.forEach((property) => {
             code += indent(state.tabSize + 1);
             code += property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
@@ -517,9 +538,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 +549,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() {