@lcap/nasl 0.3.10-beta → 0.3.10-beta.5

package/src/types/logic/LogicItem.ts

@@ -1,5 +1,5 @@
 import { immutable, excludedInJSON, action } from '../decorators';
-import { config, typeCheck, utils, Vertex, LEVEL_ENUM, Logic, Schema, ActionOptions, ACTION_MODE, BreakPoint } from '..';
+import { config, typeCheck, utils, Vertex, LEVEL_ENUM, Logic, Schema, ActionOptions, ACTION_MODE } from '..';
 import { logicService } from '../../service/logic';
 import { traverse } from '../utils';
 import { vertexsMap } from '../cacheData';
@@ -89,11 +89,11 @@ export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): st
 
     if (node.type === 'BinaryExpression') {
         let left: string = evaluate(<LogicNode>node.left, finalCode);
-        if (!atomicList.includes(node.left?.type as LOGIC_TYPE) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
+        if (!atomicList.includes((node.left as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
 
         let right: string = evaluate(<LogicNode>node.right, finalCode);
-        if (!atomicList.includes(node.right?.type as LOGIC_TYPE) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
+        if (!atomicList.includes((node.right as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
 
         return `${left} ${node.operator} ${right}`;
@@ -101,10 +101,10 @@ export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): st
 
     if (node.type === 'LogicalExpression') {
         let left: string = evaluate(<LogicNode>node.left, finalCode);
-        if (!atomicList.includes(node.left?.type as LOGIC_TYPE) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
+        if (!atomicList.includes((node.left as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
         let right: string = evaluate(<LogicNode>node.right, finalCode);
-        if (!atomicList.includes(node.right?.type as LOGIC_TYPE) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
+        if (!atomicList.includes((node.right as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
         return `${left} ${node.operator} ${right}`;
     }
@@ -310,14 +310,6 @@ export class LogicItem extends Vertex {
     public readonly pageParamKey: any = undefined;
     @immutable()
     public readonly pageParamKeyValue: any = undefined;
-
-    /**
-        断点集合
-     */
-    @immutable()
-    @excludedInJSON()
-    public breakPoints: Array<BreakPoint> = [];
-    public temporaryBreakPoint: BreakPoint = null;
     /**
      * CallQueryComponent 对应的 structure 的 id
      */
@@ -806,8 +798,6 @@ export class LogicItem extends Vertex {
 
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             if (this.id) {
-                await this.removeAllBreakPointsOfDescendants();
-
                 const body = this.toPlainJSON();
                 /// @TODO: 不知道哪里来的 index
                 delete body.index;
@@ -1149,158 +1139,6 @@ export class LogicItem extends Vertex {
                 parentAttr: activeImage.parentAttr,
             };
     }
-
-    addBreakPointInstance(bp: BreakPoint) {
-        const finded = this.breakPoints.find((item) => item.offset === bp.offset);
-        if (!finded) {
-            this.breakPoints.push(bp);
-        }
-    }
-
-    async addBreakPoint(appId: string, offsetLine = 0) {
-        let bp = this.breakPoints.find((bp) => bp.offset === offsetLine);
-        if (bp) {
-            return bp;
-        }
-        bp = new BreakPoint();
-        await bp.create({
-            appId,
-            logicItem: this,
-            offset: offsetLine,
-        });
-        this.breakPoints.push(bp);
-        const app = config.defaultApp;
-        app.debuggerClient.breakPoints.push(bp);
-        return bp;
-    }
-
-    getBreakPointByLineNumber(lineNumber: number) {
-        return this.breakPoints.find((bp) => bp.lineNumberStart === lineNumber);
-    }
-
-    addTemperaryBreakPoint(offsetLine = 0) {
-        const bp = new BreakPoint({
-            target: this.logic && this.logic.view ? 'Frontend' : 'Backend',
-            logicItem: this,
-            logicItemId: this.id,
-            componentId: this.logic && this.logic.view && this.logic.view.id,
-            component: this.logic && this.logic.view,
-            logic: this.logic,
-            status: 'Enabled',
-            offset: offsetLine,
-            isTemporary: true,
-        });
-        bp.attachSourceMap();
-        this.temporaryBreakPoint = bp;
-        return bp;
-    }
-
-    get breakPoint(): BreakPoint {
-        if (this.parent?.type === 'SwitchCase' && this.parentAttr === 'test')
-            return this.parent.breakPoint;
-
-        return this.breakPoints?.find((bp) => bp.offset === 0);
-    }
-
-    get hasBreakPoint(): boolean {
-        if (this.parent?.type === 'SwitchCase' && this.parentAttr === 'test')
-            return this.parent.hasBreakPoint;
-
-        return !!(this.temporaryBreakPoint || this.breakPoint);
-    }
-
-    get isBreakPointEnabled(): boolean {
-        if (this.parent?.type === 'SwitchCase' && this.parentAttr === 'test')
-            return this.parent.isBreakPointEnabled;
-
-        return this.breakPoint?.status === 'Enabled';
-    }
-
-    get isBreakPointDisabled(): boolean {
-        if (this.parent?.type === 'SwitchCase' && this.parentAttr === 'test')
-            return this.parent.isBreakPointDisabled;
-
-        return this.breakPoint?.status === 'Disabled';
-    }
-
-    get isBreakPointActive(): boolean {
-        if (this.parent?.type === 'SwitchCase' && this.parentAttr === 'test')
-            return this.parent.isBreakPointActive;
-        if (config.defaultApp.debuggerClient?.currentThread) {
-            const bp = this.temporaryBreakPoint || this.breakPoint;
-            return bp === config.defaultApp.debuggerClient?.currentThread.breakPoint;
-        }
-        return false;
-        // if (this.temporaryBreakPoint) {
-        //     return true;
-        // }
-        // return this.breakPoint === config.defaultApp.debuggerClient?.currentBreakPoint;
-    }
-
-    async setBreakPoint(offsetLine = 0) {
-        const app = config.defaultApp;
-        if (app.debuggerClient?.isConnected) {
-            const breakPoint = new BreakPoint({
-                target: this.logic && this.logic.view ? 'Frontend' : 'Backend',
-                logicItem: this,
-                logicItemId: this.id,
-                componentId: this.logic && this.logic.view && this.logic.view.id,
-                component: this.logic && this.logic.view,
-                logic: this.logic,
-                status: 'Enabled',
-                offset: offsetLine,
-            });
-            const attachResult = breakPoint.attachSourceMap();
-            if (attachResult) {
-                await app.debuggerClient.setRemoteBreakPoint(breakPoint);
-                await this.addBreakPoint(app.id, offsetLine);
-            } else {
-                this.emit('breakpointattacherror', {
-                    message: '未在sourceMap中找到'
-                });
-            }
-        } else {
-            await this.addBreakPoint(app.id, offsetLine);
-        }
-    }
-
-    async removeBreakPoint(offsetLine = 0) {
-        const app = config.defaultApp;
-        const breakPoints = this.parent?.type === 'SwitchCase' && this.parentAttr === 'test' ? this.parent.breakPoints : this.breakPoints;
-        const breakPoint = breakPoints.find((bp) => bp.offset === offsetLine);
-        await app.debuggerClient?.removeRemoteBreakPoint(breakPoint);
-        await breakPoint?.remove();
-    }
-
-    async removeAllBreakPointsOfDescendants() {
-        const promises: Array<Promise<void>> = [];
-        utils.traverse(({ node }) => {
-            if (node.breakPoints?.length > 0) {
-                node.breakPoints.forEach((bp) => {
-                    promises.push(node.removeBreakPoint(bp.offset));
-                });
-            }
-        }, { node: this }, {
-            mode: 'anyObject',
-            excludedKeySet: this.JSON_EXCLUDED_KEYS,
-        });
-        await Promise.all(promises);
-    }
-
-    async disableAllBreakPointsOfDescendants() {
-        const promises: Array<Promise<void>> = [];
-        utils.traverse(({ node }) => {
-            if (node.breakPoints?.length > 0) {
-                node.breakPoints.forEach((bp) => {
-                    promises.push(bp.disable());
-                });
-            }
-        }, { node: this }, {
-            mode: 'anyObject',
-            excludedKeySet: this.JSON_EXCLUDED_KEYS,
-        });
-        await Promise.all(promises);
-    }
 }
 
 export class LogicNode extends LogicItem {
@@ -1436,44 +1274,4 @@ export class ExpressionNode extends LogicItem {
         super();
         source && this.assign(source);
     }
-
-    addBreakPoint(appId: string, offsetLine = 0) {
-        // let switchParent = this.parent;
-        // let switchCase;
-        // while (switchParent && switchParent.type !== 'SwitchStatement') {
-        //     if (switchParent.type === 'SwitchCase') {
-        //         switchCase = switchParent;
-        //     }
-        //     switchParent = switchParent.parent;
-        // }
-
-        // switchCase 是个 logicNode，直接加好了
-        if (this.parent?.type === 'SwitchCase' && this.parentAttr === 'test')
-            return this.parent.addBreakPoint(appId, offsetLine);
-        // const index = switchParent.cases.findIndex((c) => c === switchCase);
-        // const id = switchCase.id;
-
-        // const view = this.logic.view;
-        // const sourceMap = view.sourceMap;
-        // const componentId = view.id;
-        // // const id = `${switchParent.id}-case${index}`;
-        // const map = sourceMap[id];
-        // if (map) {
-        //     const lineNumberStart = map.from + offsetLine;
-        //     let bp = this.breakPoints.find((bp) => bp.lineNumberStart === lineNumberStart);
-        //     if (bp) {
-        //         return bp;
-        //     }
-        //     bp = new BreakPoint({
-        //         lineNumberStart,
-        //         logicItem: switchCase,
-        //         logicItemId: switchCase.id,
-        //         componentId,
-        //     });
-        //     switchCase.breakPoints.push(bp);
-        //     return bp;
-        // }
-        // return null;
-        return super.addBreakPoint(appId, offsetLine);
-    }
 }

package/src/types/logic/Param.ts

@@ -11,21 +11,21 @@ export function catchFn(logic: Logic) {
     return async (err: any) => {
         const code = err?.code;
         // 节点已存在； 节点不存在
-        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+        if ([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
             await refreshLogic(logic);
-        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在，即逻辑不存在
-            if(logic.interface) {
+        } else if (code === BusinessCode.ParentElementNotExist) { // 父节点不存在，即逻辑不存在
+            if (logic.interface) {
                 await refreshInterfaces();
-            } else if(logic.view) {
+            } else if (logic.view) {
                 await refreshView(logic.view);
             }
         } else
             config.defaultApp?.emit('saved', err);
-       
+
         config.defaultApp?.history.load();
 
         throw err;
-    }
+    };
 }
 
 /**
@@ -98,6 +98,9 @@ export class Param extends BaseVariable {
 
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
+
+        // 更新所有调用此Logic的LogicItem
+        await this.logic.callLogicUpdate();
         return this;
     }
     /**
@@ -108,17 +111,17 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-                await paramService.delete({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Param.create',
-                        operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.logic.name}"输入参数"${this.name}"`,
-                    },
-                    query: {
-                        loValId: this.id,
-                        logicId: this.logic.id,
-                    },
-                }).catch(catchFn(this.logic));
+            await paramService.delete({
+                headers: {
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Param.create',
+                    operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.logic.name}"输入参数"${this.name}"`,
+                },
+                query: {
+                    loValId: this.id,
+                    logicId: this.logic.id,
+                },
+            }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.params.indexOf(this);