@lcap/nasl 2.18.0-beta.7 → 2.20.0-beta.1

package/src/concepts/ProcessElement__.ts

@@ -257,7 +257,7 @@ export class ProcessElement extends BaseNode {
         });
     }
 
-        getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
+    getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -398,7 +398,6 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getPointExistingNames(excludedList: Array<Point> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.waypoints as Point[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -540,7 +539,6 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getVariableExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.variables as Variable[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -682,7 +680,6 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getReturnExistingNames(excludedList: Array<Return> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.returns as Return[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -824,7 +821,6 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getConstantExistingNames(excludedList: Array<Constant> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.constants as Constant[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -966,7 +962,6 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
     getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindAttrs as BindAttribute[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1108,9 +1103,6 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1159,8 +1151,6 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除矩形信息
     * @param name 矩形信息名称
@@ -1209,8 +1199,6 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除点信息
     * @param name 点信息名称
@@ -1259,8 +1247,6 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1309,8 +1295,6 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1359,8 +1343,6 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1409,8 +1391,6 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除常量
     * @param name 常量名称
@@ -1459,8 +1439,6 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称
@@ -1596,24 +1574,29 @@ export class ProcessElement extends BaseNode {
         const tab4 = indent((state?.tabSize || 0) + 3);
         const tab5 = indent((state?.tabSize || 0) + 4);
         const tab6 = indent((state?.tabSize || 0) + 5);
+        const constantsArr: any = [];
+        const returnsArr: any = [];
         let code = `${this.name}: {\n`;
         this.variables.forEach((property) => {
             code += `${tab1}`;
             code += `${property.toEmbeddedTSInProcess(shiftState(state, code, { inline: true }))},\n`;
         });
-        this.returns.forEach((property) => {
+        this.returns.forEach((property, index) => {
             code += `${tab1}`;
-            code += `${property.toEmbeddedTSInProcess(shiftState(state, code, { inline: true }))},\n`;
+            returnsArr.push(property.toEmbeddedTSInProcess(shiftState(state, code, { inline: true })));
+            code += `${returnsArr[index]},\n`;
         });
-        this.constants.forEach((property) => {
+        this.constants.forEach((property, index) => {
             code += `${tab1}`;
-            code += `${property.toEmbeddedTSInProcess(shiftState(state, code, { inline: true }))},\n`;
+            constantsArr.push(property.toEmbeddedTSInProcess(shiftState(state, code, { inline: true })));
+            code += `${constantsArr[index]},\n`;
         });
         const afterLinks = getFlowAfterElements(this);
         const beforeLinks = getFlowBeforeElements(this);
         if (this.isUserTask
             || this.type === 'ExclusiveGateway'
-            || this.type === 'AutoTask') {
+            || this.type === 'AutoTask'
+            || this.type === 'InclusiveGateway') {
             const prevTasks = getPreviousTask(this);
             let prevCode = `${tab4}const ${this.process.name} = {\n`;
             const processName = this.process.name;
@@ -1633,10 +1616,27 @@ export class ProcessElement extends BaseNode {
 
             if (this.isUserTask) {
                 //任务完成时可以拿到输出参数，prevCodeClose包含输出参数
-                let prevCodeClose = prevCode + `\n${tab5}${this.name}: { \n${this.constants.map((c) => `${tab6}${c.toEmbeddedTSInProcess(shiftState(state, code, { inline: true }))},`).join('\n')}`;
-                prevCodeClose += ` \n${this.returns.map((c) => `${tab6}${c.toEmbeddedTSInProcess(shiftState(state, code, { inline: true }))},`).join('\n')} \n${tab5}}\n`;
+                let prevCodeClose = prevCode + `\n${tab5}${this.name}: { \n`;
+                this.constants.forEach((c, index) => {
+                    prevCodeClose += tab6;
+                    prevCodeClose += constantsArr[index];
+                    prevCodeClose += ',';
+                });
+                this.returns.forEach((c, index) => {
+                    prevCodeClose += `\n${tab6}`;
+                    prevCodeClose += returnsArr[index];
+                    prevCodeClose += ',';
+                });
+                prevCodeClose += ` \n${tab5}}\n`;
                 prevCodeClose += `${tab4}}\n`;
-                prevCode += `\n${tab5}${this.name}: { \n${this.constants.map((c) => `${tab6}${c.toEmbeddedTSInProcess(shiftState(state, code, { inline: true }))},`).join('\n')} \n${tab5}}\n`;
+
+                prevCode += `\n${tab5}${this.name}: { \n`;
+                this.constants.forEach((c, index) => {
+                    prevCode += `${tab6}`;
+                    prevCode += constantsArr[index];
+                    prevCode += ',';
+                });
+                prevCode += ` \n${tab5}}\n`;
                 prevCode += `${tab4}}\n`;
                 if (Array.isArray(this.bindEvents)) {
                     this.bindEvents.forEach((bindEvent) => {
@@ -1650,10 +1650,17 @@ export class ProcessElement extends BaseNode {
                     });
                 }
                 code += `${tab1}logics: {\n`;
-                this.bindAttrs.forEach((attr) => {
-                    if (attr.name === 'destination') {
+                let destinationAttrs = this.bindAttrs.filter((attr) => attr.name === 'destination' || attr.name.startsWith('destination-'));
+                const destinationAllEmpty = destinationAttrs.length && destinationAttrs.every((attr) => !attr.destination.viewNamespace);
+                if (destinationAllEmpty) {
+                    code += `${destinationAttrs[0].destination.toEmbeddedTSInProcess(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 3 }), prevCode)},\n`;
+                } else {
+                    destinationAttrs = destinationAttrs.filter((attr) => attr.destination.viewNamespace);
+                    destinationAttrs.forEach((attr) => {
                         code += `${attr.destination.toEmbeddedTSInProcess(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 3 }), prevCode)},\n`;
-                    }
+                    });
+                }
+                this.bindAttrs.forEach((attr) => {
                     if (attr.name === 'assignee') {
                         code += `${tab3}assignee: function(): string[] {\n`;
                         code += `${attr.assignee.toEmbeddedTSInProcess(shiftState(state, code, { tabSize: state.tabSize + 3 }), prevCode)}\n`;
@@ -1672,7 +1679,7 @@ export class ProcessElement extends BaseNode {
                 code += `${tab1}},\n`;
             }
 
-            if (this.type === 'ExclusiveGateway' || this.type === 'AutoTask') {
+            if (['ExclusiveGateway', 'AutoTask', 'InclusiveGateway'].includes(this.type)) {
                 prevCode += `\n${tab5}${this.name}:  elements.${this.name},\n`;
                 prevCode += `${tab3}}\n`;
                 code += `${tab1}logic: `;
@@ -1684,7 +1691,7 @@ export class ProcessElement extends BaseNode {
             code += `${tab1}nasl.process.oneOutcomeFlow(${afterLinks.map((l) => `'${l.name}'`).join(',')})\n`;
             code += '},\n';
         }
-        if (this.type === 'ExclusiveGateway' || this.type === 'ParallelGateway') {
+        if (['ExclusiveGateway', 'ParallelGateway', 'InclusiveGateway'].includes(this.type)) {
             code += '_constraints: function() {\n';
             code += `${tab1}nasl.process.atLeastOneOutcomeFlow(${afterLinks.map((l) => `'${l.name}'`).join(',')})\n`;
             code += `${tab1}nasl.process.atLeastOneOutcomeFlow(${beforeLinks.map((l) => `'${l.name}'`).join(',')})\n`;

package/src/concepts/ProcessOutcomes__.ts

@@ -0,0 +1,90 @@
+import { TranslatorState, withSourceMap } from '../translator';
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+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__';
+
+/**
+ * 判断结果数组
+ */
+@concept('判断结果数组')
+export class ProcessOutcomes extends LogicItem {
+    /**
+     * 产品概念
+     */
+    @property()
+    concept: 'ProcessOutcomes' = 'ProcessOutcomes';
+
+    /**
+     * 判断结果数组标题
+     */
+    @property()
+    label: string = '判断结果';
+
+    /**
+     * 关联连接器
+     */
+    @property()
+    flowRefs: Array<string> = [];
+
+    
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<ProcessOutcomes>) {
+        source = Object.assign({}, ProcessOutcomes.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+
+    static from(source: any, parentNode?: any, parentKey?: string): ProcessOutcomes {
+        return super.from(source, parentNode, parentKey) as ProcessOutcomes;
+    }
+
+    
+    /**
+     * 设置关联连接器
+     */
+    setFlowRefs(flowRefs: Array<string>) {
+        const object = {
+            flowRefs,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
+    
+
+    
+
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+    @withSourceMap()
+    toEmbeddedTS(state?: TranslatorState): string {
+        const code = `return () => ${this.flowRefs?.length > 0 ? `"${this.flowRefs}"` : '__IDENTIFIER__'}`;
+        return code;
+    }
+    //================================================================================
+    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+    //================================================================================
+}
+
+classMap.ProcessOutcomes = ProcessOutcomes;
+export default ProcessOutcomes;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Process__.ts

@@ -157,7 +157,7 @@ export class Process extends BaseNode {
         });
     }
 
-        getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
+    getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -298,7 +298,6 @@ export class Process extends BaseNode {
         return node;
     }
 
-
     getParamExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.params as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -440,7 +439,6 @@ export class Process extends BaseNode {
         return node;
     }
 
-
     getReturnExistingNames(excludedList: Array<Return> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.returns as Return[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -582,7 +580,6 @@ export class Process extends BaseNode {
         return node;
     }
 
-
     getConstantExistingNames(excludedList: Array<Constant> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.constants as Constant[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -724,7 +721,6 @@ export class Process extends BaseNode {
         return node;
     }
 
-
     getElementExistingNames(excludedList: Array<ProcessElement> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.elements as ProcessElement[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -866,9 +862,6 @@ export class Process extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -917,8 +910,6 @@ export class Process extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -967,8 +958,6 @@ export class Process extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1017,8 +1006,6 @@ export class Process extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除常量
     * @param name 常量名称
@@ -1067,8 +1054,6 @@ export class Process extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除流程元素
     * @param name 流程元素名称
@@ -1317,13 +1302,6 @@ export class Process extends BaseNode {
                         concept: 'Assignee',
                     },
                 },
-                {
-                    concept: 'BindAttribute',
-                    name: 'destination',
-                    destination: {
-                        concept: 'Destination',
-                    },
-                },
             ],
             constants: [
                 {

package/src/concepts/Return__.ts

@@ -31,6 +31,7 @@ import Logic from './Logic__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 
@@ -93,6 +94,12 @@ export class Return extends BaseNode {
     get view() {
         return this.getAncestor('View') as View;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
     /**
      * 祖先 ProcessElement
      */
@@ -238,7 +245,10 @@ export class Return extends BaseNode {
     toJS(state?: TranslatorState): string {
         const context = this.view ? 'this' : 'Vue.prototype';
         const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && !['primitive', 'union'].includes(typeAnnotation.typeKind);
+        const needGenInitFromSchema = typeAnnotation && (
+            !['primitive', 'union'].includes(typeAnnotation.typeKind) 
+            || typeAnnotation.typeName === 'DateTime'
+        );
         let code = `${this.name} =`;
         if (needGenInitFromSchema) {
             code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;

package/src/concepts/SelectMembers__.ts

@@ -332,11 +332,11 @@ export class SelectMembers extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
     get lines() {
-        const batchAssignment: any = this.getAncestor('BatchAssignment');
+        const rootNode: any = this.getAncestor('NewComposite') || this.getAncestor('BatchAssignment');
         const parentKey = this.parentKey;
-        const firstIndex = parentKey === 'left' ? 0 : batchAssignment.rights.findIndex((selectMember: SelectMembers) => selectMember === this);
+        const firstIndex = parentKey === 'left' ? 0 : rootNode.rights.findIndex((selectMember: SelectMembers) => selectMember === this);
         let count = 0;
-        batchAssignment.assignmentLines.forEach((line: AssignmentLine) => {
+        rootNode.assignmentLines.forEach((line: AssignmentLine) => {
             const lineIndex = parentKey === 'left' ? line.leftIndex[0] : line.rightIndex[0];
             if (lineIndex === firstIndex)
                 count++;

package/src/concepts/Transactional__.ts

@@ -13,6 +13,7 @@ import Logic from './Logic__';
 import Module from './Module__';
 import App from './App__';
 import View from './View__';
+import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 
@@ -69,6 +70,12 @@ export class Transactional extends BaseNode {
     get view() {
         return this.getAncestor('View') as View;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
     /**
      * 祖先 ProcessElement
      */