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

package/src/concepts/NullLiteral__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap, indent } 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 LogicItem from './LogicItem__';
@@ -49,7 +51,7 @@ export class NullLiteral extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         return 'null';
     }
 

package/src/concepts/NumericLiteral__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } 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 TypeAnnotation from './TypeAnnotation__';
@@ -111,7 +113,7 @@ export class NumericLiteral extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         const code = this.value ? String(this.value) : '';
         return code;
     }

package/src/concepts/Param__.ts

@@ -15,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__';
@@ -296,7 +297,7 @@ export class Param extends BaseNode {
         const object = {
             typeAnnotation,
             // 处理下拉属性
-            completionChildren: this.getSelectRef(),
+            // completionChildren: this.getSelectRef(),
         };
         return this.update({
             ...object,
@@ -317,7 +318,7 @@ export class Param extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
+    get readonly() {
         return !!this.module;
     }
 

package/src/concepts/Point__.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/ProcessComponent__.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__';
@@ -101,7 +102,7 @@ export class ProcessComponent 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());
@@ -243,7 +244,7 @@ export class ProcessComponent extends BaseNode {
 
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
-        return this.logics.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames());

package/src/concepts/ProcessElement__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
+import { constantToParam, returnToParam } from '../server/getProcesses';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 Rect from './Rect__';
@@ -246,33 +248,33 @@ export class ProcessElement extends BaseNode {
         });
     }
 
-        getPointExistingNames(excludedList: Array<Point> = []) {
+    getPointExistingNames(excludedList: Array<Point> = []) {
         const excludedSet = new Set(excludedList);
-        return this.waypoints.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.waypoints || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getPointUniqueName(name = 'point1') {
         return utils.unique(name, this.getPointExistingNames());
     }
 
     /**
-    * 插入点信息
-    * @internal
-    * @param name 点信息名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入点信息
+     * @internal
+     * @param name 点信息名称，如果不填会自动生成一个唯一名称
+     */
     _insertPointAt(name: string, index: number): Point;
 
     /**
-    * 插入点信息
-    * @internal
-    * @param pointOptions 点信息参数
-    */
+     * 插入点信息
+     * @internal
+     * @param pointOptions 点信息参数
+     */
     _insertPointAt(pointOptions: Partial<Point>, index: number): Point;
 
     /**
-    * 插入点信息
-    * @internal
-    * @param point 已有的点信息实例
-    */
+     * 插入点信息
+     * @internal
+     * @param point 已有的点信息实例
+     */
     _insertPointAt(point: Point, index: number): Point;
 
     _insertPointAt(options: string | Partial<Point> | Point, index: number) {
@@ -387,34 +389,33 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getVariableExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
-        return this.variables.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.variables || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVariableExistingNames());
     }
 
     /**
-    * 插入局部变量
-    * @internal
-    * @param name 局部变量名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入局部变量
+     * @internal
+     * @param name 局部变量名称，如果不填会自动生成一个唯一名称
+     */
     _insertVariableAt(name: string, index: number): Variable;
 
     /**
-    * 插入局部变量
-    * @internal
-    * @param variableOptions 局部变量参数
-    */
+     * 插入局部变量
+     * @internal
+     * @param variableOptions 局部变量参数
+     */
     _insertVariableAt(variableOptions: Partial<Variable>, index: number): Variable;
 
     /**
-    * 插入局部变量
-    * @internal
-    * @param variable 已有的局部变量实例
-    */
+     * 插入局部变量
+     * @internal
+     * @param variable 已有的局部变量实例
+     */
     _insertVariableAt(variable: Variable, index: number): Variable;
 
     _insertVariableAt(options: string | Partial<Variable> | Variable, index: number) {
@@ -529,34 +530,33 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getReturnExistingNames(excludedList: Array<Return> = []) {
         const excludedSet = new Set(excludedList);
-        return this.returns.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.returns || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getReturnUniqueName(name = 'ret1') {
         return utils.unique(name, this.getReturnExistingNames());
     }
 
     /**
-    * 插入输出参数
-    * @internal
-    * @param name 输出参数名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入输出参数
+     * @internal
+     * @param name 输出参数名称，如果不填会自动生成一个唯一名称
+     */
     _insertReturnAt(name: string, index: number): Return;
 
     /**
-    * 插入输出参数
-    * @internal
-    * @param retOptions 输出参数参数
-    */
+     * 插入输出参数
+     * @internal
+     * @param retOptions 输出参数参数
+     */
     _insertReturnAt(retOptions: Partial<Return>, index: number): Return;
 
     /**
-    * 插入输出参数
-    * @internal
-    * @param ret 已有的输出参数实例
-    */
+     * 插入输出参数
+     * @internal
+     * @param ret 已有的输出参数实例
+     */
     _insertReturnAt(ret: Return, index: number): Return;
 
     _insertReturnAt(options: string | Partial<Return> | Return, index: number) {
@@ -671,34 +671,33 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getConstantExistingNames(excludedList: Array<Constant> = []) {
         const excludedSet = new Set(excludedList);
-        return this.constants.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.constants || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getConstantUniqueName(name = 'constant1') {
         return utils.unique(name, this.getConstantExistingNames());
     }
 
     /**
-    * 插入常量
-    * @internal
-    * @param name 常量名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入常量
+     * @internal
+     * @param name 常量名称，如果不填会自动生成一个唯一名称
+     */
     _insertConstantAt(name: string, index: number): Constant;
 
     /**
-    * 插入常量
-    * @internal
-    * @param constantOptions 常量参数
-    */
+     * 插入常量
+     * @internal
+     * @param constantOptions 常量参数
+     */
     _insertConstantAt(constantOptions: Partial<Constant>, index: number): Constant;
 
     /**
-    * 插入常量
-    * @internal
-    * @param constant 已有的常量实例
-    */
+     * 插入常量
+     * @internal
+     * @param constant 已有的常量实例
+     */
     _insertConstantAt(constant: Constant, index: number): Constant;
 
     _insertConstantAt(options: string | Partial<Constant> | Constant, index: number) {
@@ -813,34 +812,33 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
-        return this.bindAttrs.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.bindAttrs || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getBindAttributeUniqueName(name = 'bindAttribute1') {
         return utils.unique(name, this.getBindAttributeExistingNames());
     }
 
     /**
-    * 插入元素绑定属性
-    * @internal
-    * @param name 元素绑定属性名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入元素绑定属性
+     * @internal
+     * @param name 元素绑定属性名称，如果不填会自动生成一个唯一名称
+     */
     _insertBindAttributeAt(name: string, index: number): BindAttribute;
 
     /**
-    * 插入元素绑定属性
-    * @internal
-    * @param bindAttributeOptions 元素绑定属性参数
-    */
+     * 插入元素绑定属性
+     * @internal
+     * @param bindAttributeOptions 元素绑定属性参数
+     */
     _insertBindAttributeAt(bindAttributeOptions: Partial<BindAttribute>, index: number): BindAttribute;
 
     /**
-    * 插入元素绑定属性
-    * @internal
-    * @param bindAttribute 已有的元素绑定属性实例
-    */
+     * 插入元素绑定属性
+     * @internal
+     * @param bindAttribute 已有的元素绑定属性实例
+     */
     _insertBindAttributeAt(bindAttribute: BindAttribute, index: number): BindAttribute;
 
     _insertBindAttributeAt(options: string | Partial<BindAttribute> | BindAttribute, index: number) {
@@ -955,13 +953,10 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
-    * 删除矩形信息
-    * @param name 矩形信息名称
-    */
+     * 删除矩形信息
+     * @param name 矩形信息名称
+     */
     removeBounds(name: string): void;
 
     /**
@@ -1006,12 +1001,10 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除点信息
-    * @param name 点信息名称
-    */
+     * 删除点信息
+     * @param name 点信息名称
+     */
     removePoint(name: string): void;
 
     /**
@@ -1056,12 +1049,10 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除逻辑
-    * @param name 逻辑名称
-    */
+     * 删除逻辑
+     * @param name 逻辑名称
+     */
     removeLogic(name: string): void;
 
     /**
@@ -1106,12 +1097,10 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除局部变量
-    * @param name 局部变量名称
-    */
+     * 删除局部变量
+     * @param name 局部变量名称
+     */
     removeVariable(name: string): void;
 
     /**
@@ -1156,12 +1145,10 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除输出参数
-    * @param name 输出参数名称
-    */
+     * 删除输出参数
+     * @param name 输出参数名称
+     */
     removeReturn(name: string): void;
 
     /**
@@ -1206,12 +1193,10 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除常量
-    * @param name 常量名称
-    */
+     * 删除常量
+     * @param name 常量名称
+     */
     removeConstant(name: string): void;
 
     /**
@@ -1256,12 +1241,10 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除元素绑定属性
-    * @param name 元素绑定属性名称
-    */
+     * 删除元素绑定属性
+     * @param name 元素绑定属性名称
+     */
     removeBindAttribute(name: string): void;
 
     /**
@@ -1317,6 +1300,7 @@ export class ProcessElement extends BaseNode {
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
+        this.syncLogic();
         const tab0 = indent(state.tabSize);
         let code = '';
         this.variables.forEach((property) => {
@@ -1338,6 +1322,17 @@ export class ProcessElement extends BaseNode {
         return code;
     }
 
+    syncLogic() {
+        if (this.type === 'UserTask') {
+            if (!this.logic) {
+                this.logic = new Logic({
+                    name: `complete`,
+                });
+            }
+            this.logic.params = [...this.constants.map(constantToParam), ...this.returns.map(returnToParam)];
+        }
+    }
+
     /**
      * 设置流程元素名称
      */
@@ -1362,7 +1357,7 @@ export class ProcessElement extends BaseNode {
     //================================================================================
 }
 
-classMap['ProcessElement'] = ProcessElement;
+classMap.ProcessElement = ProcessElement;
 export default ProcessElement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ProcessOutcome__.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 LogicItem from './LogicItem__';

package/src/concepts/Process__.ts

@@ -12,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 Param from './Param__';
@@ -150,7 +151,7 @@ export class Process 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());
@@ -292,7 +293,7 @@ export class Process extends BaseNode {
 
     getReturnExistingNames(excludedList: Array<Return> = []) {
         const excludedSet = new Set(excludedList);
-        return this.returns.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.returns || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getReturnUniqueName(name = 'ret1') {
         return utils.unique(name, this.getReturnExistingNames());
@@ -434,7 +435,7 @@ export class Process extends BaseNode {
 
     getConstantExistingNames(excludedList: Array<Constant> = []) {
         const excludedSet = new Set(excludedList);
-        return this.constants.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.constants || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getConstantUniqueName(name = 'constant1') {
         return utils.unique(name, this.getConstantExistingNames());
@@ -576,7 +577,7 @@ export class Process extends BaseNode {
 
     getElementExistingNames(excludedList: Array<ProcessElement> = []) {
         const excludedSet = new Set(excludedList);
-        return this.elements.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.elements || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getElementUniqueName(name = 'element1') {
         return utils.unique(name, this.getElementExistingNames());
@@ -972,6 +973,13 @@ export class Process extends BaseNode {
         return l;
     }
 
+    get logics() {
+        return [genLaunchProcess(this)];
+        // const ns = entity2LogicNamespace(this);
+        // ns.path = this.getNamespace() + '.' + ns.name;
+        // return ns;
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = `export namespace ${this.name} {\n`;

package/src/concepts/QueryAggregateExpression__.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 QueryFieldExpression from './QueryFieldExpression__';

package/src/concepts/QueryFieldExpression__.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__';
@@ -110,7 +111,7 @@ export class QueryFieldExpression extends LogicItem {
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         const { entityAsName, propertyName } = this;
-        return entityAsName && propertyName ? `new app.${this.app?.name}.entities.${entityAsName}().${propertyName}` : '__QueryFieldExpression__';
+        return entityAsName && propertyName ? `new app.entities.${entityAsName}().${propertyName}` : '__QueryFieldExpression__';
     }
 
     //================================================================================

package/src/concepts/QueryFromExpression__.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 QueryJoinExpression from './QueryJoinExpression__';

package/src/concepts/QueryGroupByExpression__.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 LogicItem from './LogicItem__';

package/src/concepts/QueryJoinExpression__.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 BinaryExpression from './BinaryExpression__';
@@ -89,7 +90,7 @@ export class QueryJoinExpression extends LogicItem {
 
         getBinaryExpressionExistingNames(excludedList: Array<BinaryExpression> = []) {
         const excludedSet = new Set(excludedList);
-        return this.onExpressions.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.onExpressions || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getBinaryExpressionUniqueName(name = 'binaryExpression1') {
         return utils.unique(name, this.getBinaryExpressionExistingNames());

package/src/concepts/QueryLimitExpression__.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/QueryOrderByExpression__.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__';