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

package/src/types/logic/Logic.ts

@@ -1,34 +1,24 @@
 import { immutable, excludedInJSON, circular, action } from '../decorators';
-import { config, history, utils, Vertex, LEVEL_ENUM, Interface, Param, Return, Variable, vertexsMap, typeCheck, ProcessComponent, ProcessInterface, Process, ActionOptions } from '..';
+import { config, utils, Vertex, LEVEL_ENUM, Interface, Param, Return, Variable, vertexsMap, typeCheck, ProcessComponent, ProcessInterface, Process, ActionOptions } from '..';
 import { logicService, paramService } from '../../service/logic';
-import { sourceMapService } from '../../service/debugger/debugger';
 import View from '../page/View';
 import { ExpressionNode, LogicItem, LogicNode } from './LogicItem';
 import { convert2SchemaType } from '../data/dataTypeUtils';
 import { isPlainObject, throttle } from 'lodash';
-interface sourceMapObj {
-    node: LogicItem,
-    classIdentify: string,
-    from: number,
-    lineFrom: number,
-    end: number
-    vertexId: string,
-    logicId: string,
-}
 import { refreshInterfaces, refreshView, refreshPages } from '../cache';
 import { BusinessCode } from '../enum';
 
 export function catchFn(logic: Logic) {
     return async (err: any) => {
         const code = err?.code;
-        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
-            if(logic.interface) {
+        if ([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+            if (logic.interface) {
                 await refreshInterfaces();
-            } else if(logic.view) {
+            } else if (logic.view) {
                 await refreshView(logic.view);
             }
-        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在。视图添加逻辑，发现视图不存在
-            if(logic.view) {
+        } else if (code === BusinessCode.ParentElementNotExist) { // 父节点不存在。视图添加逻辑，发现视图不存在
+            if (logic.view) {
                 await refreshPages();
             }
         } else
@@ -37,7 +27,7 @@ export function catchFn(logic: Logic) {
         config.defaultApp?.history.load();
 
         throw err;
-    }
+    };
 }
 
 /**
@@ -149,10 +139,6 @@ export class Logic extends Vertex {
      */
     @excludedInJSON()
     public contentPromise: Promise<any> = undefined;
-    @excludedInJSON()
-    public sourceMap: {
-        [id: string]: Partial<sourceMapObj>
-    } = {};
     /**
      * 树组件的子节点字段
      */
@@ -192,12 +178,10 @@ export class Logic extends Vertex {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // body.params.forEach((param: any) => convert2SchemaType(param.schema));
-        // body.returns.forEach((ret: any) => convert2SchemaType(ret.schema));
-        // body.variables.forEach((variable: any) => convert2SchemaType(variable.schema));
         utils.logger.debug('添加逻辑', body);
         const result: Logic = await logicService.create({
             headers: {
+                moduleType: this.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.create',
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.name}"`,
@@ -244,6 +228,7 @@ export class Logic extends Vertex {
 
             await logicService.delete({
                 headers: {
+                    moduleType: this.moduleType,
                     appId: config.defaultApp?.id,
                     operationAction: actionOptions?.actionName || 'Logic.delete',
                     operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
@@ -262,7 +247,6 @@ export class Logic extends Vertex {
                 typeCheck.delete(node.id);
             });
 
-            // const index =
             this.destroy();
             if (this.view) {
                 this.view.page.service.emit('pageTreeChange');
@@ -288,8 +272,9 @@ export class Logic extends Vertex {
 
         const body = this.toPlainJSON();
         utils.logger.debug('修改逻辑', body);
-        const result = await logicService.update({
+        await logicService.update({
             headers: {
+                moduleType: this.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.update',
                 operationDesc: actionOptions?.actionDesc || `修改逻辑"${this.name}"`,
@@ -302,6 +287,35 @@ export class Logic extends Vertex {
         config.defaultApp?.emit('saved');
         return this;
     }
+    /**
+     * 更新所有调用了此Logic的LogicNode
+     */
+    async callLogicUpdate(actionOptions?: ActionOptions) {
+        config.defaultApp?.emit('saving');
+
+        const body = this.toPlainJSON();
+        body.params = this.params;
+        const result = await logicService.callLogicUpdate({
+            headers: {
+                appId: config.defaultApp?.id,
+                operationAction: actionOptions?.actionName || 'Logic.callLogicUpdate',
+                operationDesc: actionOptions?.actionDesc || `修改调用逻辑"${this.name}"`,
+            },
+            body,
+        }).catch((err: Error) => console.log(err)); // 报错不应影响参数的添加流程
+
+        (result || []).forEach(async (item: LogicNode) => {
+            if (vertexsMap.has(item.id)) {
+                const logicNode = vertexsMap.get(item.id) as LogicNode;
+                await logicNode.logic.load();
+                await logicNode.checkType();
+            }
+        });
+
+        // await config.defaultApp?.history.load();
+        config.defaultApp?.emit('saved');
+        return this;
+    }
     /**
      * 设置逻辑名称
      */
@@ -342,7 +356,7 @@ export class Logic extends Vertex {
     /**
      * 按当前 id 加载逻辑数据
      */
-    async load() {
+    load() {
         if (!this.id)
             return;
 
@@ -378,6 +392,10 @@ export class Logic extends Vertex {
         });
 
         const results = await paramService.addList({
+            headers: {
+                moduleType: this.moduleType,
+                appId: config.defaultApp?.id,
+            },
             body,
         });
         params.forEach((param, index) => param.pick(results[index], ['id']));
@@ -391,10 +409,6 @@ export class Logic extends Vertex {
         if (isPlainObject(item)) {
             item = LogicItem.from(item, this, null);
         }
-        // if (!this.children.includes(child)) {
-        //     const index = child._posIndex === undefined ? this.children.length : child._posIndex;
-        //     this.children.splice(index, 0, child);
-        // }
         const parent = item.parentAttr ? vertexsMap.get(item.parentId) as LogicItem : undefined;
         return item.create({
             parent,
@@ -432,16 +446,6 @@ export class Logic extends Vertex {
 
         return result as LogicItem;
     }
-    // async loadSourceMap() {
-    //     if (!logic.view) {
-    //         const result = await sourceMapService.getSourceMap({
-    //             query: {
-    //                 scopeId: this.id,
-    //             },
-    //         });
-    //         this.sourceMap = result;
-    //     }
-    // }
     /**
      * 从后端 JSON 生成规范的 Logic 对象
      */

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
      */
@@ -456,6 +448,7 @@ export class LogicItem extends Vertex {
             body.logicId = this.logic && this.logic.id;
             result = await logicService.addItem({
                 headers: {
+                    moduleType: this.logic && this.logic.moduleType,
                     appId: config.defaultApp?.id,
                     serviceId: this.logic?.interface?.serviceId,
                     operationAction: 'LogicItem.create',
@@ -556,8 +549,9 @@ export class LogicItem extends Vertex {
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             utils.logger.debug(`在该逻辑节点的属性"${parentAttr}"上插入一个节点"`, body);
 
-            const result: LogicItem = await logicService.moveItem({
+            await logicService.moveItem({
                 headers: {
+                    moduleType: this.logic && this.logic.moduleType,
                     appId: config.defaultApp?.id,
                     operationAction: 'LogicItem.move',
                     operationDesc: actionOptions?.actionDesc || `移动逻辑项"${this.label || this.type}"`,
@@ -608,7 +602,7 @@ export class LogicItem extends Vertex {
         await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
             operationAction: 'LogicItem.move',
             operationBeforeImage: null,
-            operationAfterImage: null, // JSON.parse(JSON.stringify(this)),
+            operationAfterImage: null,
             operationDesc: `移动逻辑项"${this.label || this.type}"`,
         });
         config.defaultApp?.emit('saved');
@@ -806,8 +800,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;
@@ -815,11 +807,11 @@ export class LogicItem extends Vertex {
 
                 await logicService.removeItem({
                     headers: {
+                        moduleType: this.logic.moduleType,
                         appId: config.defaultApp?.id,
                         serviceId: this.logic?.interface?.serviceId,
                         operationAction: 'LogicItem.delete',
                         operationDesc: `删除逻辑项"${this.label || this.type}"`,
-
                     },
                     body,
                 }).catch(catchFn(this.logic));
@@ -888,7 +880,6 @@ export class LogicItem extends Vertex {
             }
             this.assign(source);
         }
-        // const body = this.toPlainJSON();
         const body = this.toJSON();
 
         body.params = (this as any).params && JSON.parse(JSON.stringify((this as any).params));
@@ -907,6 +898,7 @@ export class LogicItem extends Vertex {
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             const result = await logicService.updateItem({
                 headers: {
+                    moduleType: this.logic.moduleType,
                     appId: config.defaultApp?.id,
                     operationAction: 'LogicItem.update',
                     operationDesc: `修改逻辑项"${this.label || this.type}"`,
@@ -914,7 +906,6 @@ export class LogicItem extends Vertex {
                 },
                 body,
             }).catch(catchFn(this.logic));
-            // this.deepPick(result, ['id', 'parentId', 'parentAttr']);
 
             // 合并params里的id
             if (body.params && body.params.length) {
@@ -934,7 +925,6 @@ export class LogicItem extends Vertex {
             let eachSchema = getSchemaOfExpressionNode(each);
             if (eachSchema) {
                 eachSchema = eachSchema.schema || eachSchema;
-                // eachSchema = convert2SchemaType(eachSchema);
                 (item as any).schema = eachSchema.items; // 兼容老的items形式
                 if (eachSchema.type === 'genericType') {
                     (item as any).schema = eachSchema.typeInstantiation.typeParams[0].typeParamValue;
@@ -955,7 +945,7 @@ export class LogicItem extends Vertex {
 
         await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
             operationAction: 'LogicItem.update',
-            operationBeforeImage: null, // JSON.parse(JSON.stringify(this)),
+            operationBeforeImage: null,
             operationAfterImage: null,
             operationDesc: `修改逻辑项"${this.label || this.type}"`,
         });
@@ -1092,7 +1082,6 @@ export class LogicItem extends Vertex {
         if (!typeCheckResult || !logicItem || typeof typeCheckResult !== 'object')
             return;
 
-        // if(logicItem.id === typeCheckResult.id)
         logicItem.typeCheckNote = typeCheckResult.typeCheckNote;
 
         for (const [key, object] of Object.entries(typeCheckResult)) {
@@ -1149,158 +1138,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 {
@@ -1382,8 +1219,6 @@ export class LogicNode extends LogicItem {
         const hasInstantiated = source && source.id && vertexsMap.get(source.id) instanceof LogicNode;
         if (hasInstantiated) {
             console.warn(`LogicNode (${source.id}) 多次实例化`);
-            // Object.assign(vertexsMap.get(source.id), source);
-            // return vertexsMap.get(source.id) as LogicNode;
         }
 
         source && this.assign(source);
@@ -1436,44 +1271,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);
-    }
 }