@lcap/nasl 2.12.0-beta → 2.12.0-beta.1

package/src/concepts/Module__.ts

@@ -70,7 +70,7 @@ export class Module extends BaseNode {
      * 外部语言依赖
      */
     @property()
-    externalDependencyMap: { maven?: Array<{ groupId: string, artifactId: string, version: string }> } = undefined;
+    externalDependencyMap: { maven?: Array<{ groupId: string; artifactId: string; version: string }> } = undefined;
 
     /**
      * 数据结构列表
@@ -145,9 +145,8 @@ export class Module extends BaseNode {
         }
         return params;
     }
-    
 
-        getStructureExistingNames(excludedList: Array<Structure> = []) {
+    getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -156,24 +155,24 @@ export class Module extends BaseNode {
     }
 
     /**
-    * 插入数据结构
-    * @internal
-    * @param name 数据结构名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入数据结构
+     * @internal
+     * @param name 数据结构名称，如果不填会自动生成一个唯一名称
+     */
     _insertStructureAt(name: string, index: number): Structure;
 
     /**
-    * 插入数据结构
-    * @internal
-    * @param structureOptions 数据结构参数
-    */
+     * 插入数据结构
+     * @internal
+     * @param structureOptions 数据结构参数
+     */
     _insertStructureAt(structureOptions: Partial<Structure>, index: number): Structure;
 
     /**
-    * 插入数据结构
-    * @internal
-    * @param structure 已有的数据结构实例
-    */
+     * 插入数据结构
+     * @internal
+     * @param structure 已有的数据结构实例
+     */
     _insertStructureAt(structure: Structure, index: number): Structure;
 
     _insertStructureAt(options: string | Partial<Structure> | Structure, index: number) {
@@ -288,7 +287,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
         return (this.enums || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -298,24 +296,24 @@ export class Module extends BaseNode {
     }
 
     /**
-    * 插入枚举
-    * @internal
-    * @param name 枚举名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入枚举
+     * @internal
+     * @param name 枚举名称，如果不填会自动生成一个唯一名称
+     */
     _insertEnumAt(name: string, index: number): Enum;
 
     /**
-    * 插入枚举
-    * @internal
-    * @param enumerationOptions 枚举参数
-    */
+     * 插入枚举
+     * @internal
+     * @param enumerationOptions 枚举参数
+     */
     _insertEnumAt(enumerationOptions: Partial<Enum>, index: number): Enum;
 
     /**
-    * 插入枚举
-    * @internal
-    * @param enumeration 已有的枚举实例
-    */
+     * 插入枚举
+     * @internal
+     * @param enumeration 已有的枚举实例
+     */
     _insertEnumAt(enumeration: Enum, index: number): Enum;
 
     _insertEnumAt(options: string | Partial<Enum> | Enum, index: number) {
@@ -430,7 +428,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -440,24 +437,24 @@ export class Module extends BaseNode {
     }
 
     /**
-    * 插入逻辑
-    * @internal
-    * @param name 逻辑名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入逻辑
+     * @internal
+     * @param name 逻辑名称，如果不填会自动生成一个唯一名称
+     */
     _insertLogicAt(name: string, index: number): Logic;
 
     /**
-    * 插入逻辑
-    * @internal
-    * @param logicOptions 逻辑参数
-    */
+     * 插入逻辑
+     * @internal
+     * @param logicOptions 逻辑参数
+     */
     _insertLogicAt(logicOptions: Partial<Logic>, index: number): Logic;
 
     /**
-    * 插入逻辑
-    * @internal
-    * @param logic 已有的逻辑实例
-    */
+     * 插入逻辑
+     * @internal
+     * @param logic 已有的逻辑实例
+     */
     _insertLogicAt(logic: Logic, index: number): Logic;
 
     _insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
@@ -572,7 +569,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
         return (this.interfaces || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -582,24 +578,24 @@ export class Module extends BaseNode {
     }
 
     /**
-    * 插入接口
-    * @internal
-    * @param name 接口名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入接口
+     * @internal
+     * @param name 接口名称，如果不填会自动生成一个唯一名称
+     */
     _insertInterfaceAt(name: string, index: number): Interface;
 
     /**
-    * 插入接口
-    * @internal
-    * @param itfaceOptions 接口参数
-    */
+     * 插入接口
+     * @internal
+     * @param itfaceOptions 接口参数
+     */
     _insertInterfaceAt(itfaceOptions: Partial<Interface>, index: number): Interface;
 
     /**
-    * 插入接口
-    * @internal
-    * @param itface 已有的接口实例
-    */
+     * 插入接口
+     * @internal
+     * @param itface 已有的接口实例
+     */
     _insertInterfaceAt(itface: Interface, index: number): Interface;
 
     _insertInterfaceAt(options: string | Partial<Interface> | Interface, index: number) {
@@ -714,7 +710,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return (this.views || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -724,24 +719,24 @@ export class Module extends BaseNode {
     }
 
     /**
-    * 插入页面
-    * @internal
-    * @param name 页面名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入页面
+     * @internal
+     * @param name 页面名称，如果不填会自动生成一个唯一名称
+     */
     _insertViewAt(name: string, index: number): View;
 
     /**
-    * 插入页面
-    * @internal
-    * @param viewOptions 页面参数
-    */
+     * 插入页面
+     * @internal
+     * @param viewOptions 页面参数
+     */
     _insertViewAt(viewOptions: Partial<View>, index: number): View;
 
     /**
-    * 插入页面
-    * @internal
-    * @param view 已有的页面实例
-    */
+     * 插入页面
+     * @internal
+     * @param view 已有的页面实例
+     */
     _insertViewAt(view: View, index: number): View;
 
     _insertViewAt(options: string | Partial<View> | View, index: number) {
@@ -856,7 +851,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
         return (this.processes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -866,24 +860,24 @@ export class Module extends BaseNode {
     }
 
     /**
-    * 插入流程
-    * @internal
-    * @param name 流程名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入流程
+     * @internal
+     * @param name 流程名称，如果不填会自动生成一个唯一名称
+     */
     _insertProcessAt(name: string, index: number): Process;
 
     /**
-    * 插入流程
-    * @internal
-    * @param processOptions 流程参数
-    */
+     * 插入流程
+     * @internal
+     * @param processOptions 流程参数
+     */
     _insertProcessAt(processOptions: Partial<Process>, index: number): Process;
 
     /**
-    * 插入流程
-    * @internal
-    * @param process 已有的流程实例
-    */
+     * 插入流程
+     * @internal
+     * @param process 已有的流程实例
+     */
     _insertProcessAt(process: Process, index: number): Process;
 
     _insertProcessAt(options: string | Partial<Process> | Process, index: number) {
@@ -998,7 +992,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getViewComponentExistingNames(excludedList: Array<ViewComponent> = []) {
         const excludedSet = new Set(excludedList);
         return (this.viewComponents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1008,24 +1001,24 @@ export class Module extends BaseNode {
     }
 
     /**
-    * 插入页面组件
-    * @internal
-    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入页面组件
+     * @internal
+     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     */
     _insertViewComponentAt(name: string, index: number): ViewComponent;
 
     /**
-    * 插入页面组件
-    * @internal
-    * @param viewComponentOptions 页面组件参数
-    */
+     * 插入页面组件
+     * @internal
+     * @param viewComponentOptions 页面组件参数
+     */
     _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
 
     /**
-    * 插入页面组件
-    * @internal
-    * @param viewComponent 已有的页面组件实例
-    */
+     * 插入页面组件
+     * @internal
+     * @param viewComponent 已有的页面组件实例
+     */
     _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
 
     _insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
@@ -1140,13 +1133,10 @@ export class Module extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
-    * 删除数据结构
-    * @param name 数据结构名称
-    */
+     * 删除数据结构
+     * @param name 数据结构名称
+     */
     removeStructure(name: string): void;
 
     /**
@@ -1191,12 +1181,10 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除枚举
-    * @param name 枚举名称
-    */
+     * 删除枚举
+     * @param name 枚举名称
+     */
     removeEnum(name: string): void;
 
     /**
@@ -1241,12 +1229,10 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除逻辑
-    * @param name 逻辑名称
-    */
+     * 删除逻辑
+     * @param name 逻辑名称
+     */
     removeLogic(name: string): void;
 
     /**
@@ -1291,12 +1277,10 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除接口
-    * @param name 接口名称
-    */
+     * 删除接口
+     * @param name 接口名称
+     */
     removeInterface(name: string): void;
 
     /**
@@ -1341,12 +1325,10 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除页面
-    * @param name 页面名称
-    */
+     * 删除页面
+     * @param name 页面名称
+     */
     removeView(name: string): void;
 
     /**
@@ -1391,12 +1373,10 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除流程
-    * @param name 流程名称
-    */
+     * 删除流程
+     * @param name 流程名称
+     */
     removeProcess(name: string): void;
 
     /**
@@ -1441,12 +1421,10 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除页面组件
-    * @param name 页面组件名称
-    */
+     * 删除页面组件
+     * @param name 页面组件名称
+     */
     removeViewComponent(name: string): void;
 
     /**
@@ -1495,37 +1473,53 @@ export class Module extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
     /**
+     * 用于区分存量应用新导入模块,存量应用替换数据结构使用
+     */
+     @property()
+     isAdd: boolean;
+
+     setIsAdd(isAdd: boolean) {
+         const object = {
+             isAdd,
+         };
+         this.update({
+             ...object,
+         });
+     }
+     /**
      * 生成宿主语言的文件路径
      * @param name 一般不用传，用于 rename
      */
-    getEmbeddedFilePath(name = this.name) {
-        return `/embedded/${this.app.name}/${this.parentKey}/${this.name}`;
-    }
-    /**
+     getEmbeddedFilePath(name = this.name) {
+         return `/embedded/${this.app.name}/${this.parentKey}/${this.name}`;
+     }
+     /**
      * 获取命名空间和
      * 暂时不考虑 Module 嵌套的情况
      */
-    getNamespace() {
-        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
-    }
+     getNamespace() {
+         return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
+     }
 
-    getTsNamespace() {
-        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
-    }
+     getTsNamespace() {
+         return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
+     }
+     getTsNamespaceAndName() {
+         return `${moduleNameSpace[this.parentKey as ModuleKeyType]}.${this.name}`;
+     }
 
-    findEnumByName(name: string) {
-        return this.enums.find((enumItem) => enumItem.name === name);
-    }
+     findEnumByName(name: string) {
+         return this.enums.find((enumItem) => enumItem.name === name);
+     }
 
-    /**
+     /**
      *  获取属性节点是否存在
      */
 
-    findProperty(name: string, propertyType: PropertyType): any {
-        return ((this as any)[propertyType] as Array<any>).find((item) => item.name === name);
-    }
+     findProperty(name: string, propertyType: PropertyType): any {
+         return ((this as any)[propertyType] as Array<any>).find((item) => item.name === name);
+     }
 
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/Namespace__.ts

@@ -2288,7 +2288,7 @@ export class Namespace extends BaseNode {
         if (this.path)
             return this.path;
         else if (this.parentNode && (this.parentNode as Namespace).getNamespace)
-            return `${(this.parentNode as Namespace).getNamespace()}.${this.name}`;
+            return `${(this.parentNode as Namespace).getNamespace()}`;
         else
             throw new Error('无法获取命名空间，请设置 parentNode 或临时的 path！');
     }
@@ -2319,7 +2319,7 @@ export class Namespace extends BaseNode {
     //================================================================================
 }
 
-classMap.Namespace = Namespace;
+classMap['Namespace'] = Namespace;
 export default Namespace;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/NullLiteral__.ts

@@ -76,7 +76,7 @@ export class NullLiteral extends LogicItem {
     //================================================================================
 }
 
-classMap.NullLiteral = NullLiteral;
+classMap['NullLiteral'] = NullLiteral;
 export default NullLiteral;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/NumericLiteral__.ts

@@ -187,7 +187,7 @@ export class NumericLiteral extends LogicItem {
     //================================================================================
 }
 
-classMap.NumericLiteral = NumericLiteral;
+classMap['NumericLiteral'] = NumericLiteral;
 export default NumericLiteral;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Param__.ts

@@ -356,7 +356,7 @@ export class Param extends BaseNode {
             const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
             let completionChildren;
             if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
                     const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
                     const properties = node.properties || [];
                     completionChildren = properties;
@@ -394,7 +394,7 @@ export class Param extends BaseNode {
     //================================================================================
 }
 
-classMap.Param = Param;
+classMap['Param'] = Param;
 export default Param;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Point__.ts

@@ -77,7 +77,7 @@ export class Point extends BaseNode {
     //================================================================================
 }
 
-classMap.Point = Point;
+classMap['Point'] = Point;
 export default Point;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ProcessComponent__.ts

@@ -495,7 +495,7 @@ export class ProcessComponent extends BaseNode {
     //================================================================================
 }
 
-classMap.ProcessComponent = ProcessComponent;
+classMap['ProcessComponent'] = ProcessComponent;
 export default ProcessComponent;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ProcessElement__.ts

@@ -1,5 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
-import { constantToParam, genUserTaskLogic, returnToParam, getPreviousTask, syncMemberExpression, getFlowAfterElements, isFromStartNode } from '../server/getProcesses';
+import { constantToParam, genUserTaskLogic, returnToParam, getPreviousTask, syncMemberExpression, getFlowAfterElements, isFromStartNode, getFlowBeforeElements } from '../server/getProcesses';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -1347,6 +1347,7 @@ export class ProcessElement extends BaseNode {
             code += `${property.toEmbeddedTSInProcess(shiftState(state, code, { inline: true }))},\n`;
         });
         const afterLinks = getFlowAfterElements(this);
+        const beforeLinks = getFlowBeforeElements(this);
         if (this.type === 'UserTask'
             || this.type === 'ExclusiveGateway'
             || this.type === 'AutoTask') {
@@ -1404,7 +1405,11 @@ export class ProcessElement extends BaseNode {
         }
         if(this.type === 'ExclusiveGateway' || this.type === 'ParallelGateway') {
             code += '_constraints: function() {\n'
-            code += `${tab1}nasl.process.atLeastTwoOutcomeFlow(${afterLinks.map(l => `'${l.name}'`).join(',')})\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`
+            if(afterLinks.length > 0 && beforeLinks.length > 0) {
+                code += `${tab1}nasl.process.atLeastThreeOutcomeFlow(${beforeLinks.concat(afterLinks).map(l => `'${l.name}'`).join(',')})\n`
+            }
             code += '},\n'
         }
 
@@ -1470,7 +1475,7 @@ export class ProcessElement extends BaseNode {
     //================================================================================
 }
 
-classMap.ProcessElement = ProcessElement;
+classMap['ProcessElement'] = ProcessElement;
 export default ProcessElement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ProcessOutcome__.ts

@@ -84,7 +84,7 @@ export class ProcessOutcome extends LogicItem {
     //================================================================================
 }
 
-classMap.ProcessOutcome = ProcessOutcome;
+classMap['ProcessOutcome'] = ProcessOutcome;
 export default ProcessOutcome;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Process__.ts

@@ -949,9 +949,9 @@ export class Process extends BaseNode {
         return params;
     }
 
-    getVarExistingNames(excludedList: Array<Param | Return | Constant> = []) {
+    getVarExistingNames(excludedList: Array<Param | Return | Constant | ProcessElement> = []) {
         const excludedSet = new Set(excludedList);
-        return [...this.params, ...this.returns, ...this.constants].filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return [...this.params, ...this.returns, ...this.constants, ...this.elements].filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
 
     getNamespace(ns: string) {
@@ -1120,7 +1120,7 @@ export class Process extends BaseNode {
     //================================================================================
 }
 
-classMap.Process = Process;
+classMap['Process'] = Process;
 export default Process;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/QueryAggregateExpression__.ts

@@ -156,7 +156,7 @@ export class QueryAggregateExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QueryAggregateExpression = QueryAggregateExpression;
+classMap['QueryAggregateExpression'] = QueryAggregateExpression;
 export default QueryAggregateExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/QueryFieldExpression__.ts

@@ -132,7 +132,7 @@ export class QueryFieldExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QueryFieldExpression = QueryFieldExpression;
+classMap['QueryFieldExpression'] = QueryFieldExpression;
 export default QueryFieldExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑