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

package/src/types/logic/LogicItem.ts

@@ -1,11 +1,12 @@
-import { immutable, excludedInJSON, circular, action } from '../decorators';
-import { config, history, typeCheck, utils, Vertex, Service, LEVEL_ENUM, Interface, Param, Return, Variable, Logic, View, Schema, ActionOptions, ACTION_MODE } from '..';
+import { immutable, excludedInJSON, action } from '../decorators';
+import { config, typeCheck, utils, Vertex, LEVEL_ENUM, Logic, Schema, ActionOptions, ACTION_MODE } from '..';
 import { logicService } from '../../service/logic';
-import { assert } from 'console';
 import { traverse } from '../utils';
 import { vertexsMap } from '../cacheData';
 import { getSchemaOfExpressionNode } from './tools';
 import Structure from '../data/Structure';
+import { refreshLogic } from '../cache';
+import { BusinessCode } from '../enum';
 
 export enum LOGIC_TYPE {
     // LogicNode
@@ -56,6 +57,18 @@ export enum LOGIC_TYPE {
     QueryAggregateExpression = 'QueryAggregateExpression',
 }
 
+const atomicList = [
+    LOGIC_TYPE.Identifier,
+    LOGIC_TYPE.NumericLiteral,
+    LOGIC_TYPE.BooleanLiteral,
+    LOGIC_TYPE.StringLiteral,
+    LOGIC_TYPE.NullLiteral,
+    LOGIC_TYPE.UnaryExpression,
+    LOGIC_TYPE.MemberExpression,
+    LOGIC_TYPE.Unparsed,
+    LOGIC_TYPE.BuiltInFunction,
+];
+
 export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): string {
     if (!node)
         return '';
@@ -76,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 (!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 (!finalCode && node.right?.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}`;
@@ -88,13 +101,11 @@ export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): st
 
     if (node.type === 'LogicalExpression') {
         let left: string = evaluate(<LogicNode>node.left, finalCode);
-        if (!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 (!finalCode && node.right?.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}`;
     }
 
@@ -209,6 +220,18 @@ export const logicItemArrayKeyOfLogicItem: string[] = ['body', 'consequent', 'al
     'groupBy', 'orderBy', 'selectElementList', 'joinPartList', 'onExpressionList', 'where', 'having',
 ];
 
+export function catchFn(logic: Logic) {
+    return async (err: any) => {
+        if (err.code !== BusinessCode.HasReferenced) // 节点被引用，不用刷新数据
+            await refreshLogic(logic);
+        else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+        throw err;
+    };
+}
+
 /**
  * 逻辑项类
  */
@@ -432,7 +455,7 @@ export class LogicItem extends Vertex {
                     operationIgnore: actionOptions?.actionIgnore,
                 },
                 body,
-            });
+            }).catch(catchFn(this.logic));
             this.deepPick(result, ['id', 'parentId', 'parentAttr', 'joinPartRef', 'structureRef']);
         }
 
@@ -548,7 +571,7 @@ export class LogicItem extends Vertex {
                         offsetY,
                     },
                 },
-            });
+            }).catch(catchFn(this.logic));
         }
 
         if (!(this.parentId === parentId && this.parentId === this.logic.playgroundId && this.parentAttr === parentAttr)) {
@@ -612,6 +635,8 @@ export class LogicItem extends Vertex {
      * @param targetId
      */
     static async paste(logicItems: LogicItem[] | LogicItem, targetType: 'logic' | 'html' | 'processComponent', targetId: string) {
+        config.defaultApp?.emit('saving');
+
         if (!Array.isArray(logicItems))
             logicItems = [logicItems];
 
@@ -630,7 +655,7 @@ export class LogicItem extends Vertex {
                 operationAction: 'LogicItem.paste',
                 operationDesc: `粘贴逻辑项"${logicItems[0].label || logicItems[0].type}"`,
             },
-        });
+        }).catch(catchFn(vertexsMap.get(targetId) as Logic));
 
         LogicItem.redoPaste(res);
     }
@@ -778,21 +803,16 @@ export class LogicItem extends Vertex {
                 delete body.index;
                 ///
 
-                try {
-                    await logicService.removeItem({
-                        headers: {
-                            appId: config.defaultApp?.id,
-                            serviceId: this.logic?.interface?.serviceId,
-                            operationAction: 'LogicItem.delete',
-                            operationDesc: `删除逻辑项"${this.label || this.type}"`,
-
-                        },
-                        body,
-                    });
-                } catch (err) {
-                    await config.defaultApp?.history.load();
-                    throw err;
-                }
+                await logicService.removeItem({
+                    headers: {
+                        appId: config.defaultApp?.id,
+                        serviceId: this.logic?.interface?.serviceId,
+                        operationAction: 'LogicItem.delete',
+                        operationDesc: `删除逻辑项"${this.label || this.type}"`,
+
+                    },
+                    body,
+                }).catch(catchFn(this.logic));
             }
         }
 
@@ -883,7 +903,7 @@ export class LogicItem extends Vertex {
                     operationIgnore: actionOptions?.actionIgnore,
                 },
                 body,
-            });
+            }).catch(catchFn(this.logic));
             // this.deepPick(result, ['id', 'parentId', 'parentAttr']);
 
             // 合并params里的id

package/src/types/logic/Param.ts

@@ -4,6 +4,29 @@ import { paramService } from '../../service/logic';
 import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
+import { refreshLogic, refreshInterfaces, refreshView } 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)) {
+            await refreshLogic(logic);
+        } else if (code === BusinessCode.ParentElementNotExist) { // 父节点不存在，即逻辑不存在
+            if (logic.interface) {
+                await refreshInterfaces();
+            } else if (logic.view) {
+                await refreshView(logic.view);
+            }
+        } else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+
+        throw err;
+    };
+}
 
 /**
  * 逻辑输入参数
@@ -60,7 +83,7 @@ export class Param extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"输入参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
@@ -75,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;
     }
     /**
@@ -85,22 +111,17 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
-                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(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+            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);
@@ -133,7 +154,7 @@ export class Param extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑输入参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
         // convert2RefType(result.schema);
         // this.plainAssign(result);

package/src/types/logic/Return.ts

@@ -4,7 +4,7 @@ import { paramService } from '../../service/logic';
 import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
-
+import { catchFn } from './Param';
 /**
  * 逻辑输出参数
  */
@@ -50,7 +50,7 @@ export class Return extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"输出参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
@@ -75,7 +75,6 @@ export class Return extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
                 await paramService.delete({
                     headers: {
                         appId: config.defaultApp?.id,
@@ -86,11 +85,7 @@ export class Return extends BaseVariable {
                         loValId: this.id,
                         logicId: this.logic.id,
                     },
-                });
-            } catch(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+                }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.returns.indexOf(this);
@@ -123,7 +118,7 @@ export class Return extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑输出参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
         // convert2RefType(result.schema);
         // this.plainAssign(result);

package/src/types/logic/Variable.ts

@@ -4,6 +4,7 @@ import { paramService } from '../../service/logic';
 import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
+import { catchFn } from './Param';
 
 /**
  * 逻辑局部变量
@@ -49,7 +50,7 @@ export class Variable extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"局部变量"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
@@ -73,7 +74,6 @@ export class Variable extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
                 await paramService.delete({
                     headers: {
                         appId: config.defaultApp?.id,
@@ -84,11 +84,7 @@ export class Variable extends BaseVariable {
                         loValId: this.id,
                         logicId: this.logic.id,
                     },
-                });
-            } catch(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+                }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.variables.indexOf(this);
@@ -120,7 +116,7 @@ export class Variable extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑局部变量"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
         // convert2RefType(result.schema);
         // this.plainAssign(result);

package/src/types/logic/translator.js

@@ -1,4 +1,3 @@
-import generate from '@babel/generator';
 import { Vertex } from '..';
 
 function switchCase2If(cases) {
@@ -9,7 +8,13 @@ function switchCase2If(cases) {
         test: cas.test,
         consequent: {
             type: 'BlockStatement',
-            body: cas.consequent || [],
+            body: [
+                {
+                    type: 'CallConsoleInfo',
+                    content: 'SWITCHCASE',
+                },
+                ...cas.consequent || [],
+            ]
         },
         alternate: null,
     };
@@ -19,7 +24,13 @@ function switchCase2If(cases) {
     } else {
         return {
             type: 'BlockStatement',
-            body: cas.consequent || [],
+            body: [
+                {
+                    type: 'CallConsoleInfo',
+                    content: 'SWITCHDEFAULT',
+                },
+                ...cas.consequent || [],
+            ]
         };
     }
 
@@ -27,6 +38,7 @@ function switchCase2If(cases) {
 }
 
 export default function (source) {
+    const isGONGHANG = window.appInfo.env === 'gonghang' || global.appInfoEnv === 'gonghang';
     const definition = typeof source === 'string' ? JSON.parse(source) : source;
 
     function traverse(node, func, parent, index) {
@@ -459,6 +471,14 @@ export default function (source) {
                 return `${newLine()}console.log(${generateNode(node.arguments[0])})${colon()}${newLine()}`;
             }
 
+            if(node.type === 'CallConsoleInfo') {
+                if(isGONGHANG) {
+                    return `console.info(${node.content})${colon()}`;
+                }
+                return '';
+
+            }
+
             if (node.type === 'Destination') {
                 const params = (node.params || [])
                     .filter((param) => param.pageParamKey && param.pageParamKeyValue)
@@ -479,16 +499,27 @@ export default function (source) {
                 if (Array.isArray(node.consequent)) {
                     node.consequent = {
                         type: 'BlockStatement',
-                        body: node.consequent,
+                        body: [
+                            {
+                                type: 'CallConsoleInfo',
+                                content: 'IF',
+                            },
+                            ...node.consequent,
+                        ]
                     };
                 }
-                if (Array.isArray(node.alternate)) {
+                if (Array.isArray(node.alternate) && node.alternate.length > 0) {
                     node.alternate = {
                         type: 'BlockStatement',
-                        body: node.alternate,
+                        body: [
+                            {
+                                type: 'CallConsoleInfo',
+                                content: 'ELSE',
+                            },
+                            ...node.alternate,
+                        ]
                     };
                 }
-
                 let alternateScript = '';
                 if (node.alternate) {
                     alternateScript = generateNode(node.alternate);
@@ -597,13 +628,10 @@ export default function (source) {
             script += `${generateNode(node, index)}${newLine()}`;
         });
 
-        // console.info("JSON generate:", JSON.stringify(logic.body));
-        // console.log(generate({ type: 'Program', body: logic.body }).code);
-
         return `methods['${logic.name}'] = async function (${logic.params.map((param) => param.name).join(', ')}) {
-            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`).join('\n') + '' : ''}
-            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`).join('\n') + '' : ''}
-            let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});
+            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});` + (isGONGHANG ? `console.info(${param.name})` : '')).join('\n') + '' : ''}
+            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});` + (isGONGHANG ? `console.info(${variable.name})` : '')).join('\n') + '' : ''}
+            let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});` + (isGONGHANG ? `console.info(${returnObj.name})` : '') + `
             ${script}
         }`;
     });

package/src/types/logic/translator_backup.js

@@ -1,8 +1,6 @@
 import generate from '@babel/generator';
 import * as babel from '@babel/core';
-import { TransforClientQuery as genQuery } from 'apollo-plugin-loader';
-import { Vertex, vertexesMap, utils } from '..';
-import { getQuerySchemaMap } from './tools';
+import { Vertex, utils } from '..';
 
 function switchCase2If(cases) {
     const cas = cases.shift();
@@ -81,9 +79,7 @@ export default function (source) {
         } else if (node.type === 'MemberExpression') {
             return checkThis(node.object);
         } else if (node.type === 'CallExpression') {
-            (node.arguments || []).forEach((arg) => {
-                return checkThis(arg);
-            });
+            (node.arguments || []).forEach((arg) => checkThis(arg));
         }
     }
     function safeGenerate(node) {
@@ -586,7 +582,7 @@ export default function (source) {
                         const jsBlock_${index} = async () => {
                             ${node.code}
                         }
-                    
+
                         await jsBlock_${index}();
                     }`,
                         {
@@ -600,16 +596,9 @@ export default function (source) {
             }
         });
 
-        // console.info("JSON generate:", JSON.stringify(logic.body));
-        // console.log(generate({ type: 'Program', body: logic.body }).code);
-
         return `methods['${logic.name}'] = async function (${logic.params.map((param) => param.name).join(', ')}) {
-            ${logic.params.length ? logic.params.map((param) => {
-        return `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`;
-    }).join('\n') + '' : ''}
-            ${logic.variables.length ? logic.variables.map((variable) => {
-        return `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`;
-    }).join('\n') + '' : ''}
+            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`).join('\n') + '' : ''}
+            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`).join('\n') + '' : ''}
             let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});
             ${generate({ type: 'Program', body: logic.body }).code}
         }`;

package/src/types/nuims/Nuims.ts

@@ -17,7 +17,7 @@ interface RoleItem extends Role {
     toggling?: Boolean,
 }
 
-interface Permission{
+interface Permission {
     DomainName: string,
     PermissionId: string,
     PermissionValue: string,
@@ -79,7 +79,7 @@ export class Nuims {
         }
     }
 
-    async getInitRoles() {
+    async getInitRoles(auto: unknown) {
         let isCreated = false;
         let resource = await this.getResource();
         if (!resource) {
@@ -99,9 +99,15 @@ export class Nuims {
                 await this.bindRolesAndPermissions(role, permission);
             }
             roleName2Permission.set(role.RoleName, permission);
-            // 创建 /dashboard 资源时自动关联 DEV-AdminRole 权限
-            if (isCreated && (ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
-                await this.attachPermissionResourceAction();
+            if (auto) {
+                if ((ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
+                    await this.attachPermissionResourceAction();
+                }
+            } else {
+                // 创建 /dashboard 资源时自动关联 DEV-AdminRole 权限
+                if (isCreated && (ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
+                    await this.attachPermissionResourceAction();
+                }
             }
             roleItem.permission = permission;
             const resources = await this.getResourcesFromPermission(permission);