@lcap/nasl 0.3.9 → 0.3.10-beta

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.d.ts

@@ -0,0 +1,16 @@
+
+declare namespace Translator {
+    export interface FrontEndsourceMap {
+        [id: string]: {
+            isLogic: boolean,
+            node: LogicItem,
+            from: number,
+            to: number,
+        }
+    }
+}
+declare function Translator(source: string, preScript: string): {
+    output: string,
+    sourceMap: Translator.FrontEndsourceMap,
+};
+export = Translator;

package/src/types/logic/translator.js

@@ -1,12 +1,13 @@
-import generate from '@babel/generator';
 import { Vertex } from '..';
 
-function switchCase2If(cases) {
+function switchCase2If(node, cases, idx = 0) {
     const cas = cases.shift();
 
     const result = {
         type: 'IfStatement',
         test: cas.test,
+        level: 'logicNode',
+        id: cas.id,
         consequent: {
             type: 'BlockStatement',
             body: cas.consequent || [],
@@ -15,18 +16,19 @@ function switchCase2If(cases) {
     };
 
     if (cases.length) {
-        result.alternate = switchCase2If(cases);
+        result.alternate = switchCase2If(node, cases, idx + 1);
     } else {
         return {
             type: 'BlockStatement',
             body: cas.consequent || [],
+            id: cas.id,
         };
     }
 
     return result;
 }
 
-export default function (source) {
+export default function (source, preScript) {
     const definition = typeof source === 'string' ? JSON.parse(source) : source;
 
     function traverse(node, func, parent, index) {
@@ -122,6 +124,35 @@ export default function (source) {
 }
         }`);
 
+    let output = `
+        const methods = componentOptions.methods = componentOptions.methods || {};
+        const computed = componentOptions.computed = componentOptions.computed || {};
+        const oldDataFunc = componentOptions.data;
+        const data = function () {
+            const oldData = oldDataFunc ? oldDataFunc.call(this) : {};
+            return Object.assign(oldData, {
+                ${paramsData ? paramsData + ',' : ''}
+                ${variablesData}
+            });
+        };
+        componentOptions.data = data;
+        const meta = componentOptions.meta = componentOptions.meta || {};
+        Object.assign(meta, {
+            title: ${JSON.stringify(definition.title)},
+            crumb: ${JSON.stringify(definition.crumb)},
+            first: ${JSON.stringify(definition.first)},
+        });
+
+        ${lifecycles.join('\n\n')}
+
+    `;
+
+    let startLineNumber = output.split('\n').length;
+    if (preScript && typeof preScript === 'string') {
+        startLineNumber += (preScript.split('\n').length - 2);
+    }
+    // console.log(preScript.split('\n').length, output.split('\n').length, startLineNumber);
+    const sourceMap = {};
     const methods = (definition.logics || []).map((logic) => {
         let returnObj = {
             type: 'Identifier',
@@ -131,10 +162,18 @@ export default function (source) {
         if (logic.returns[0])
             returnObj = logic.returns[0];
 
-        const newLine = () => '\n';
+        // let lineRecorder = 0;
+        const recorder = {
+            line: startLineNumber,
+        };
+        const _newLine = () => '\n';
+        const newLine = () => {
+            recorder.line += 1;
+            return _newLine();
+        };
         const colon = () => ';';
 
-        const generateNode = (node, logicItemIndex) => {
+        const _generateNode = (node, logicItemIndex) => {
             if (!node)
                 return '';
             if (node.type === 'End') {
@@ -179,7 +218,7 @@ export default function (source) {
                     return `${object}[${property.value}]`;
             }
             if (node.type === 'AssignmentExpression') {
-                return `${newLine()}${generateNode(node.left)} = ${generateNode(node.right)}${colon()}${newLine()}`;
+                return `${generateNode(node.left)} = ${generateNode(node.right)}${colon()}${newLine()}`;
             }
             if (node.type === 'CallExpression') {
                 const args = [];
@@ -228,23 +267,29 @@ export default function (source) {
                     const interfaceKeyTarget = Vertex.getVertexByRef(key);
                     const arr = key.split('/');
                     const download = interfaceKeyTarget && interfaceKeyTarget.name && interfaceKeyTarget.name.includes('export');
-                    return `await this.$services['_custom']['ID_${arr[arr.length - 1]}']({
+                    return `await (async () => { console.debug('logic-trace');let result = await this.$services['_custom']['ID_${arr[arr.length - 1]}']({
                         config: {
                             download: ${download},
                         },
                         path: {
-                            ${getParams('path').join(',\n')}
+                            ${getParams('path').join(',')}
                         },
                         query: {
-                            ${getParams('query').join(',\n')}
+                            ${getParams('query').join(',')}
                         },
                         headers: {
-                            ${getParams('header').join(',\n')}
+                            ${getParams('header').join(',')}
                         },
                         body: ${getParams('body') || '{}'},
-                    })`;
+                    });
+                    console.debug('logic-trace-end');
+                    return result; 
+                    })();
+                    `;
                 } else {
-                    return `await this.${node.calleeCode}(${node.params.map((param) => generateNode(param.callInterParamValue) || 'undefined').join(',')})`;
+                    return `await (async () => {console.debug('logic-trace');let result = await this.${node.calleeCode}(${node.params.map((param) => generateNode(param.callInterParamValue) || 'undefined').join(',')});
+                    console.debug('logic-trace-end');return result; })()
+                    `;
                 }
             }
 
@@ -283,21 +328,24 @@ export default function (source) {
                 const interfaceKeyTarget = Vertex.getVertexByRef(node.interfaceKey);
                 const download = interfaceKeyTarget && interfaceKeyTarget.name && interfaceKeyTarget.name.includes('export');
 
-                return `await this.$services['_custom']['ID_${arr[arr.length - 1]}']({
+                return `await (async () => {console.debug('logic-trace');let result = await this.$services['_custom']['ID_${arr[arr.length - 1]}']({
                     config: {
                         download: ${download},
                     },
                     path: {
-                        ${getParams('path').join(',\n')}
+                        ${getParams('path').join(',')}
                     },
                     query: {
-                        ${getParams('query').join(',\n')}
+                        ${getParams('query').join(',')}
                     },
                     headers: {
-                        ${getParams('header').join(',\n')}
+                        ${getParams('header').join(',')}
                     },
                     body: ${getParams('body') || '{}'},
-                })`;
+                });
+                console.debug('logic-trace-end');
+                return result; })()
+                `;
             }
 
             if (node.type === 'CallGraphQL') {
@@ -352,13 +400,13 @@ export default function (source) {
                         download: ${key.includes('export')},
                     },
                     path: {
-                        ${getParams('path').join(',\n')}
+                        ${getParams('path').join(',')}
                     },
                     query: {
-                        ${getParams('query').join(',\n')}
+                        ${getParams('query').join(',')}
                     },
                     headers: {
-                        ${getParams('header').join(',\n')}
+                        ${getParams('header').join(',')}
                     },
                     body: ${getParams('body') || '{}'},
                 })).Data`;
@@ -369,7 +417,7 @@ export default function (source) {
                     .filter((param) => param.in === undefined) // 放在body内部的参数
                     .filter((param) => generateNode(param.value) !== '')
                     .map((param) => `${safeKey(param.name)}: ${generateNode(param.value)}`)
-                    .join(',\n');
+                    .join(',');
                 const getObj = (type) =>
                     (node.params || [])
                         .filter((param) => param.in === type)
@@ -452,11 +500,11 @@ export default function (source) {
             }
 
             if (node.type === 'CallMessageShow') {
-                return `${newLine()}this.$toast.show(${generateNode(node.arguments[0])})${colon()}${newLine()}`;
+                return `this.$toast.show(${generateNode(node.arguments[0])})${colon()}${newLine()}`;
             }
 
             if (node.type === 'CallConsoleLog') {
-                return `${newLine()}console.log(${generateNode(node.arguments[0])})${colon()}${newLine()}`;
+                return `console.log(${generateNode(node.arguments[0])})${colon()}${newLine()}`;
             }
 
             if (node.type === 'Destination') {
@@ -489,12 +537,11 @@ export default function (source) {
                     };
                 }
 
+                let resultScript = `if(${generateNode(node.test)}) ${generateNode(node.consequent)}`;
                 let alternateScript = '';
                 if (node.alternate) {
                     alternateScript = generateNode(node.alternate);
                 }
-
-                let resultScript = `if(${generateNode(node.test)}) ${generateNode(node.consequent)}`;
                 resultScript = alternateScript ? `${resultScript} else ${alternateScript}` : resultScript;
                 return resultScript;
             }
@@ -503,51 +550,41 @@ export default function (source) {
                 if (!node.body) {
                     return '';
                 }
+                const str = `{${newLine()}`;
                 const body = (node.body || []).map((body) => `${generateNode(body)}${colon()}${newLine()}`);
-                return `{
-                    ${body.join(' ')}
-                }`;
+                return `${str}${body.join(' ')}${newLine()}}`;
             }
 
             if (node.type === 'WhileStatement') {
-                let bodyScript = '';
+                let bodyScript = `(['WhileStatement']);${newLine()}while(${generateNode(node.test)}) {${newLine()}`;
                 if (Array.isArray(node.body)) {
                     node.body.forEach((body) => {
                         bodyScript += `${generateNode(body)}${newLine()}`;
                     });
                 }
-                return `${newLine()}while(${generateNode(node.test)}) {
-                    ${bodyScript}
-                }${newLine()}`;
+                return `${bodyScript}${newLine()}}${newLine()}`;
             }
 
             if (node.type === 'SwitchStatement') {
-                Object.assign(node, switchCase2If(node.cases));
-                return generateNode(node);
+                const nextNode = Object.assign({}, node, switchCase2If(node, node.cases));
+                return `(['SwitchStatement']);${newLine()}${generateNode(nextNode)}`;
             }
 
             if (node.type === 'ForEachStatement') {
-                let bodyScript = '';
-                if (Array.isArray(node.body)) {
-                    node.body.forEach((body) => {
-                        bodyScript += `${generateNode(body)}${newLine()}`;
-                    });
-                }
-                const indexScript = generateNode(node.index);
-                const startScript = generateNode(node.start);
-                const itemScript = generateNode(node.item);
-                const endScript = generateNode(node.end);
-                const eachScript = generateNode(node.each);
+                const generateBodyScript = () => {
+                    let bodyScript = '';
+                    if (Array.isArray(node.body)) {
+                        node.body.forEach((body) => {
+                            bodyScript += `${generateNode(body)}${newLine()}`;
+                        });
+                    }
+                    return bodyScript;
+                };
 
                 if (node.label === 'async') { // 临时测试 async 的方式
-                    return `${newLine()}await Promise.all(${eachScript}.slice(${startScript}, ${endScript}).map(async (${itemScript}, ${indexScript}) => {
-                        ${bodyScript}
-                    })${newLine()}`;
+                    return `(['ForEachStatement']);${newLine()}await Promise.all(${generateNode(node.each)}.slice(${generateNode(node.start)}, ${generateNode(node.end)}).map(async (${generateNode(node.item)}, ${generateNode(node.index)}) => {${newLine()}${generateBodyScript()}})${newLine()}`;
                 } else {
-                    return `${newLine()}for (let ${indexScript}=${startScript}; ${indexScript} < ${endScript}; ${indexScript}++){
-                        const ${itemScript} = ${eachScript}[${indexScript}];
-                        ${bodyScript}
-                    }${newLine()}`;
+                    return `(['ForEachStatement']);${newLine()}for (let ${generateNode(node.index)}=${generateNode(node.start)}; ${generateNode(node.index)} < ${generateNode(node.end)}; ${generateNode(node.index)}++){${newLine()}const ${generateNode(node.item)} = ${generateNode(node.each)}[${generateNode(node.index)}];${newLine()}${generateBodyScript()}}${newLine()}`;
                 }
             }
 
@@ -564,12 +601,16 @@ export default function (source) {
             }
 
             if (node.type === 'JSBlock') {
-                return `${newLine()}{
-                    const jsBlock_${logicItemIndex} = async () => {
-                        ${node.code}
-                    }
+                // return `${newLine()}{
+                //     const jsBlock_${logicItemIndex} = async () => {
+                //         ${node.code}
+                //     }
 
-                    await jsBlock_${logicItemIndex}();
+                //     await jsBlock_${logicItemIndex}();
+                // }${newLine()}`;
+
+                return `(['JSBlock_${logicItemIndex}']);${newLine()}{
+                    ${node.code}
                 }${newLine()}`;
             }
 
@@ -592,45 +633,60 @@ export default function (source) {
             return '';
         };
 
-        let script = '';
-        logic.body.forEach((node, index) => {
-            script += `${generateNode(node, index)}${newLine()}`;
-        });
+        // source map for debugger!!!
+        const generateNode = (node, logicItemIndex) => {
+            const startLine = recorder.line;
+
+            const str = _generateNode(node, logicItemIndex);
+            const length = String(str).split('\n').length - 1;
+            recorder.line = startLine + length;
+            // console.log(node.type, startLine);
+            // if (node.type === 'JSBlock') {
+            //     startLine = recorder.line - 2;
+            // }
+            sourceMap[node.id] = {
+                node,
+                // jsBlockFrom: recorder.line - 2,
+                from: startLine,
+                to: recorder.line,
+            };
+            return str;
+        };
 
         // 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(', ')}) {
+        sourceMap[logic.id] = {
+            node: logic,
+            isLogic: true,
+            from: startLineNumber,
+        };
+        // console.log(logic.name, startLineNumber);
+        let mstr = `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)});
-            ${script}
-        }`;
-    });
+            `;
 
-    const output = `
-        const methods = componentOptions.methods = componentOptions.methods || {};
-        const computed = componentOptions.computed = componentOptions.computed || {};
-        const oldDataFunc = componentOptions.data;
-        const data = function () {
-            const oldData = oldDataFunc ? oldDataFunc.call(this) : {};
-            return Object.assign(oldData, {
-                ${paramsData ? paramsData + ',' : ''}
-                ${variablesData}
-            });
-        };
-        componentOptions.data = data;
-        const meta = componentOptions.meta = componentOptions.meta || {};
-        Object.assign(meta, {
-            title: ${JSON.stringify(definition.title)},
-            crumb: ${JSON.stringify(definition.crumb)},
-            first: ${JSON.stringify(definition.first)},
+        let script = '';
+        // vital
+        recorder.line += mstr.split('\n').length - 1;
+        logic.body.forEach((node, index) => {
+            script += `${generateNode(node, index)}${newLine()}`;
         });
 
-        ${lifecycles.join('\n\n')}
+        mstr += script;
+        mstr += `
+        }\n\n`;
+        // vital
+        startLineNumber += mstr.split('\n').length - 1;
+        sourceMap[logic.id].to = startLineNumber - 1;
+        return mstr;
+    });
 
-        ${methods.join('\n\n')}
-    `;
+    output += methods.join('');
 
-    return output;
+    return {
+        output,
+        sourceMap,
+    };
 }

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);