@lcap/nasl 2.13.0-beta.1 → 2.13.0-beta.2

package/src/concepts/ProcessElement__.ts

@@ -1,6 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
 import { constantToParam, genUserTaskLogic, returnToParam, getPreviousTask, syncMemberExpression, getFlowAfterElements, isFromStartNode, getFlowBeforeElements } from '../server/getProcesses';
-import Namespace from './Namespace__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -12,7 +11,6 @@ import * as utils from '../utils';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
-import BindEvent from './BindEvent__';
 import Rect from './Rect__';
 import Point from './Point__';
 import Logic from './Logic__';
@@ -53,12 +51,6 @@ export class ProcessElement extends BaseNode {
     @property()
     description: string = undefined;
 
-    /**
-     * 元素绑定事件列表
-     */
-    @property('BindEvent')
-    bindEvents: Array<BindEvent> = [];
-
     /**
      * type
      */
@@ -256,149 +248,7 @@ export class ProcessElement extends BaseNode {
         });
     }
 
-        getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
-    }
-    getBindEventUniqueName(name = 'bindEvent1') {
-        return utils.unique(name, this.getBindEventExistingNames(), undefined, false);
-    }
-
-    /**
-    * 插入元素绑定事件
-    * @internal
-    * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-    */
-    _insertBindEventAt(name: string, index: number): BindEvent;
-
-    /**
-    * 插入元素绑定事件
-    * @internal
-    * @param bindEventOptions 元素绑定事件参数
-    */
-    _insertBindEventAt(bindEventOptions: Partial<BindEvent>, index: number): BindEvent;
-
-    /**
-    * 插入元素绑定事件
-    * @internal
-    * @param bindEvent 已有的元素绑定事件实例
-    */
-    _insertBindEventAt(bindEvent: BindEvent, index: number): BindEvent;
-
-    _insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
-        const bindEventOptions: any = {};
-        const relationOptions = { parentNode: this, parentKey: 'bindEvents' };
-        let bindEvent: BindEvent;
-        if (!options) {
-            bindEvent = BindEvent.from({
-                ...bindEventOptions,
-                name: this.getBindEventUniqueName(),
-            }, this, 'bindEvents');
-        } else if (typeof options === 'string') {
-            bindEvent = BindEvent.from({
-                ...bindEventOptions,
-                name: options,
-            }, this, 'bindEvents');
-        } else if (options instanceof BindEvent) {
-            options.ensureDelete(); // 同一实例不支持多处存在
-            bindEvent = options;
-            Object.assign(bindEvent, relationOptions);
-        } else {
-            bindEvent = BindEvent.from({
-                ...bindEventOptions,
-                ...options,
-            }, this, 'bindEvents');
-        }
-        this.bindEvents.splice(index, 0, bindEvent);
-        return bindEvent;
-    }
-
-    /**
-     * 插入元素绑定事件
-     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-     */
-    insertBindEventAt(name: string, index: number): BindEvent;
-
-    /**
-     * 插入元素绑定事件
-     * @param bindEventOptions 元素绑定事件参数
-     */
-    insertBindEventAt(bindEventOptions: Partial<BindEvent>, index: number): BindEvent;
-
-    /**
-     * 插入元素绑定事件
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    insertBindEventAt(bindEvent: BindEvent, index: number): BindEvent;
-
-    insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
-        const node = this._insertBindEventAt(options as any, index);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'bindEvents',
-        });
-        return node;
-    }
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-     */
-    _addBindEvent(name?: string): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param bindEventOptions 元素绑定事件参数
-     */
-    _addBindEvent(bindEventOptions: Partial<BindEvent>): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    _addBindEvent(bindEvent: BindEvent): BindEvent;
-
-    _addBindEvent(options?: string | Partial<BindEvent> | BindEvent) {
-        const index = this.bindEvents.length;
-        return this._insertBindEventAt(options as any, index);
-    }
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-     */
-    addBindEvent(name?: string): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @param bindEventOptions 元素绑定事件参数
-     */
-    addBindEvent(bindEventOptions: Partial<BindEvent>): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    addBindEvent(bindEvent: BindEvent): BindEvent;
-
-    addBindEvent(options?: string | Partial<BindEvent> | BindEvent) {
-        const node = this._addBindEvent(options as any);
-        const index = this.bindEvents.indexOf(node);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'bindEvents',
-        });
-        return node;
-    }
-
-
-    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);
     }
@@ -1110,56 +960,6 @@ export class ProcessElement extends BaseNode {
 
     
 
-    /**
-    * 删除元素绑定事件
-    * @param name 元素绑定事件名称
-    */
-    removeBindEvent(name: string): void;
-
-    /**
-     * 删除元素绑定事件
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    removeBindEvent(bindEvent: BindEvent): void;
-
-    removeBindEvent(options: string | BindEvent) {
-        let bindEvent: BindEvent;
-        if (typeof options === 'string') {
-            bindEvent = this.bindEvents.find((item) => item.name === options);
-            if (!bindEvent) {
-                throw new Error('找不到元素绑定事件 ' + options);
-            }
-        } else {
-            bindEvent = options;
-        }
-        return bindEvent.delete();
-    }
-
-    __removeBindEvent(bindEvent: BindEvent) {
-        const parentKey = bindEvent.parentKey;
-        const params: Params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: bindEvent,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(bindEvent);
-                ~index && (this as any)[parentKey].splice(index, 1);
-                params.index = index;
-            } else if ((this as any)[parentKey] === bindEvent) {
-                params.index = 0;
-                (this as any)[parentKey] = undefined;
-            }
-        }
-        return params;
-    }
-
-
-
     /**
     * 删除矩形信息
     * @param name 矩形信息名称
@@ -1524,19 +1324,6 @@ export class ProcessElement extends BaseNode {
         // return ns;
     }
 
-    getNamespace(ns: string) {
-        if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
-            const parentNamespace = (this.parentNode as Namespace).getNamespace();
-            const parentName = this.parentNode.name;
-            const arr = [parentNamespace];
-            if (this.parentNode.concept !== 'App' && parentName) {
-                arr.push(parentName);
-            }
-            return `${arr.join('.')}.${ns || 'bindEvent'}`;
-        } else
-            throw new Error('无法获取命名空间，请设置 parentNode！');
-    }
-
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         // this.syncLogic();
@@ -1582,21 +1369,8 @@ export class ProcessElement extends BaseNode {
             // prevCode += `${tab4}}\n`
 
             if (this.type === 'UserTask') {
-                //任务完成时可以拿到输出参数，prevCodeClose包含输出参数
-                let prevCodeClose = prevCode + `\n${tab5}${this.name}: { \n${this.constants.map((c) => `${tab6}${c.name}: "",`).join('\n')} \n${this.returns.map((c) => `${tab6}${c.name}: "",`).join('\n')}}\n`;
-                prevCodeClose += `${tab3}}\n`;
                 prevCode += `\n${tab5}${this.name}: { \n${this.constants.map((c) => `${tab6}${c.name}: "",`).join('\n')} }\n`;
                 prevCode += `${tab3}}\n`;
-                if (Array.isArray(this.bindEvents)) {
-                    this.bindEvents.forEach((bindEvent) => {
-                        //任务完成时可以拿到输出参数
-                        const currentPrevCode = bindEvent.name === 'OnClose' ? prevCodeClose : prevCode;
-                        bindEvent.logics.forEach((logic) => {
-                            code += `${tab1}${logic.name}: `;
-                            code += `${logic.toEmbeddedTSInProcess(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 3 }), currentPrevCode, true)},\n`;
-                        });
-                    });
-                }
                 code += `${tab1}logics: {\n`;
                 this.bindAttrs.forEach((attr) => {
                     if (attr.name === 'destination') {

package/src/concepts/Process__.ts

@@ -16,7 +16,6 @@ import * as utils from '../utils';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
-import BindEvent from './BindEvent__';
 import Param from './Param__';
 import Return from './Return__';
 import Constant from './Constant__';
@@ -53,12 +52,6 @@ export class Process extends BaseNode {
     @property()
     description: string = undefined;
 
-    /**
-     * 元素绑定事件列表
-     */
-    @property('BindEvent')
-    bindEvents: Array<BindEvent> = [];
-
     /**
      * 输入参数列表
      */
@@ -157,149 +150,7 @@ export class Process extends BaseNode {
         });
     }
 
-        getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
-    }
-    getBindEventUniqueName(name = 'bindEvent1') {
-        return utils.unique(name, this.getBindEventExistingNames(), undefined, false);
-    }
-
-    /**
-    * 插入元素绑定事件
-    * @internal
-    * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-    */
-    _insertBindEventAt(name: string, index: number): BindEvent;
-
-    /**
-    * 插入元素绑定事件
-    * @internal
-    * @param bindEventOptions 元素绑定事件参数
-    */
-    _insertBindEventAt(bindEventOptions: Partial<BindEvent>, index: number): BindEvent;
-
-    /**
-    * 插入元素绑定事件
-    * @internal
-    * @param bindEvent 已有的元素绑定事件实例
-    */
-    _insertBindEventAt(bindEvent: BindEvent, index: number): BindEvent;
-
-    _insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
-        const bindEventOptions: any = {};
-        const relationOptions = { parentNode: this, parentKey: 'bindEvents' };
-        let bindEvent: BindEvent;
-        if (!options) {
-            bindEvent = BindEvent.from({
-                ...bindEventOptions,
-                name: this.getBindEventUniqueName(),
-            }, this, 'bindEvents');
-        } else if (typeof options === 'string') {
-            bindEvent = BindEvent.from({
-                ...bindEventOptions,
-                name: options,
-            }, this, 'bindEvents');
-        } else if (options instanceof BindEvent) {
-            options.ensureDelete(); // 同一实例不支持多处存在
-            bindEvent = options;
-            Object.assign(bindEvent, relationOptions);
-        } else {
-            bindEvent = BindEvent.from({
-                ...bindEventOptions,
-                ...options,
-            }, this, 'bindEvents');
-        }
-        this.bindEvents.splice(index, 0, bindEvent);
-        return bindEvent;
-    }
-
-    /**
-     * 插入元素绑定事件
-     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-     */
-    insertBindEventAt(name: string, index: number): BindEvent;
-
-    /**
-     * 插入元素绑定事件
-     * @param bindEventOptions 元素绑定事件参数
-     */
-    insertBindEventAt(bindEventOptions: Partial<BindEvent>, index: number): BindEvent;
-
-    /**
-     * 插入元素绑定事件
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    insertBindEventAt(bindEvent: BindEvent, index: number): BindEvent;
-
-    insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
-        const node = this._insertBindEventAt(options as any, index);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'bindEvents',
-        });
-        return node;
-    }
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-     */
-    _addBindEvent(name?: string): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param bindEventOptions 元素绑定事件参数
-     */
-    _addBindEvent(bindEventOptions: Partial<BindEvent>): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    _addBindEvent(bindEvent: BindEvent): BindEvent;
-
-    _addBindEvent(options?: string | Partial<BindEvent> | BindEvent) {
-        const index = this.bindEvents.length;
-        return this._insertBindEventAt(options as any, index);
-    }
-
-    /**
-     * 添加元素绑定事件
-     * @internal
-     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-     */
-    addBindEvent(name?: string): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @param bindEventOptions 元素绑定事件参数
-     */
-    addBindEvent(bindEventOptions: Partial<BindEvent>): BindEvent;
-
-    /**
-     * 添加元素绑定事件
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    addBindEvent(bindEvent: BindEvent): BindEvent;
-
-    addBindEvent(options?: string | Partial<BindEvent> | BindEvent) {
-        const node = this._addBindEvent(options as any);
-        const index = this.bindEvents.indexOf(node);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'bindEvents',
-        });
-        return node;
-    }
-
-
-    getParamExistingNames(excludedList: Array<Param> = []) {
+        getParamExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return (this.params || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -869,56 +720,6 @@ export class Process extends BaseNode {
 
     
 
-    /**
-    * 删除元素绑定事件
-    * @param name 元素绑定事件名称
-    */
-    removeBindEvent(name: string): void;
-
-    /**
-     * 删除元素绑定事件
-     * @param bindEvent 已有的元素绑定事件实例
-     */
-    removeBindEvent(bindEvent: BindEvent): void;
-
-    removeBindEvent(options: string | BindEvent) {
-        let bindEvent: BindEvent;
-        if (typeof options === 'string') {
-            bindEvent = this.bindEvents.find((item) => item.name === options);
-            if (!bindEvent) {
-                throw new Error('找不到元素绑定事件 ' + options);
-            }
-        } else {
-            bindEvent = options;
-        }
-        return bindEvent.delete();
-    }
-
-    __removeBindEvent(bindEvent: BindEvent) {
-        const parentKey = bindEvent.parentKey;
-        const params: Params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: bindEvent,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(bindEvent);
-                ~index && (this as any)[parentKey].splice(index, 1);
-                params.index = index;
-            } else if ((this as any)[parentKey] === bindEvent) {
-                params.index = 0;
-                (this as any)[parentKey] = undefined;
-            }
-        }
-        return params;
-    }
-
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1200,34 +1001,6 @@ export class Process extends BaseNode {
             ...logics,
         ];
     }
-    /**
-     * 获取当前逻辑下所有elements上bindEvents下的logic
-     */
-    get elementLogicRoot() {
-        const logics: Array<Logic> = [];
-        // 页面上的绑定的事件
-        this.bindEvents.forEach((bindEvent) => {
-            bindEvent.logics.forEach((logic) => {
-                logics.push(logic);
-            });
-        });
-        this.elements.forEach((item) => {
-            if (item.concept === 'ProcessElement' && item.type === 'UserTask') {
-                utils.traverse((current) => {
-                    current.node.bindEvents.forEach((bindEvent) => {
-                        bindEvent.logics.forEach((logic) => {
-                            logics.push(logic);
-                        });
-                    });
-                }, { node: item });
-            }
-        });
-        return [{
-            concept: 'elementLogicRoot',
-            expanded: false,
-            children: logics,
-        }];
-    }
 
     toUserTaskPropertyGetterTS(userTask: ProcessElement) {
         return `let ${userTask.name} = elements.${userTask.name};`;
@@ -1275,15 +1048,6 @@ export class Process extends BaseNode {
             }
         });
         code += `${tab1}}\n`;
-        // 流程逻辑提示错误信息
-        if (Array.isArray(this.bindEvents)) {
-            this.bindEvents.forEach((event) => {
-                code += event.toEmbeddedTS(shiftState(state, code, {
-                    tabSize: (state?.tabSize || 0),
-                }));
-                code += '\n';
-            });
-        }
         code += `}\n`;
         return code;
     }

package/src/concepts/ViewElement__.ts

@@ -7,7 +7,7 @@ import * as compiler from 'vue-template-compiler';
 
 import LogicItem from './LogicItem__';
 
-import { config, Logic } from '..';
+import { config } from '..';
 
 export interface ParseContext {
     [key: string]: any;
@@ -192,6 +192,12 @@ export class ViewElement extends BaseNode {
     @property()
     staticStyle: string = undefined;
 
+    /**
+     * 权限资源描述
+     */
+    @property()
+    authDescription: string = undefined;
+
     /**
      * 插槽目标
      */
@@ -300,6 +306,18 @@ export class ViewElement extends BaseNode {
         });
     }
 
+    /**
+     * 设置权限资源描述
+     */
+    setAuthDescription(authDescription: string) {
+        const object = {
+            authDescription,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
         getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindAttrs || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1227,18 +1245,6 @@ export class ViewElement extends BaseNode {
             code += indent((state?.tabSize || 0) + 2);
             code += '],\n';
         }
-        // 绑定属性
-        if (Array.isArray(this.bindAttrs)) {
-            this.bindAttrs.forEach((attr) => {
-                // 跳转页面
-                if (attr.destination) {
-                    code += attr.destination.toEmbeddedTS(shiftState(state, code, {
-                        tabSize: (state?.tabSize || 0),
-                    }));
-                }
-            });
-            code += '\n';
-        }
 
         // 事件
         if (Array.isArray(this.bindEvents)) {
@@ -1256,38 +1262,16 @@ export class ViewElement extends BaseNode {
 
             if (Array.isArray(this.bindAttrs)) {
                 code += `bindAttr: () => [\n`;
-                this.bindAttrs.forEach((attr) => {
-                    if (attr.expression) {
-                        code
-                            += attr.expression.toEmbeddedTS(shiftState(state, code, {
-                                tabSize: (state?.tabSize || 0) + 2,
-                            })) + ',\n';
-                    }
-                    if (Array.isArray(attr.rules) && attr.rules.length) {
-                        attr.rules.forEach((item) => {
-                            code += item.toEmbeddedTS(shiftState(state, code)) + ',\n';
-                        });
-                    }
-                });
-                this.bindDirectives.forEach((directive) => {
-                    if (directive.expression) {
-                        code
-                            += directive.expression.toEmbeddedTS(shiftState(state, code, {
-                                tabSize: (state?.tabSize || 0) + 2,
-                            })) + ',\n';
-                    }
-                });
+                this.bindAttrs.forEach((attr) => code += attr.toEmbeddedTS(shiftState(state, code, { tabSize: 0 })) + ',\n');
+                this.bindDirectives.forEach((directive) => code += directive.toEmbeddedTS(shiftState(state, code, { tabSize: 0 })) + ',\n');
                 code += indent((state?.tabSize || 0) + 2) + '],\n';
             }
 
             let levelIndex = parentLevel || 0;
             if (this.haveScope(this)) {
-                code += indent((state?.tabSize || 0) + 2);
-                // code += `slotDefault: (scope${levelIndex === 0 ? '' : levelIndex})=> [\n`;
                 code += `slotDefault: (scope)=> [\n`;
                 levelIndex++;
             } else {
-                code += indent((state?.tabSize || 0) + 2);
                 code += `slotDefault: ()=> [\n`;
             }
 
@@ -1475,7 +1459,7 @@ export class ViewElement extends BaseNode {
                     .forEach((name) => {
                         const oldEvent = astNode.events[name] as compiler.ASTElementHandler;
                         const str = oldEvent.value;
-                        const calleeName = str.split('(')[0];
+                        let calleeName = str.split('(')[0];
                         const matchArr = str.match(/\(([^)]*)\)/) || [];
                         let argsStr = '';
                         if (matchArr?.length >= 2) {
@@ -1492,17 +1476,21 @@ export class ViewElement extends BaseNode {
                                     expression: genArgumentMemberExpression(keyword),
                                 };
                             });
-                        const viewLogics = context?.definition?.viewLogics || [];
-                        const currentLogic = viewLogics.find((item: Logic) => item.name === calleeName);
-                        if (currentLogic) {
-                            element.addBindEvent(new BindEvent({
-                                name,
-                                calleeNamespace: '',
-                                calleeName: '',
-                                arguments: args,
-                                logics: [currentLogic],
-                            }));
+                        let calleeNamespace = '';
+                        if (calleeName) {
+                            const namespaceArr = calleeName.split('.');
+                            const start = namespaceArr.shift();
+                            if (start === '$refs' && namespaceArr.length === 2) {
+                                calleeNamespace = `elements.${namespaceArr[0]}.logics`;
+                                calleeName = namespaceArr[1];
+                            }
                         }
+                        element.addBindEvent(new BindEvent({
+                            name,
+                            calleeNamespace,
+                            calleeName,
+                            arguments: args,
+                        }));
                     });
 
             astNode.directives