@lcap/nasl 2.20.0-beta.4 → 2.20.1-beta.1

package/src/concepts/View__.ts

@@ -266,6 +266,8 @@ export class View extends BaseNode {
         });
     }
 
+    
+
     /**
     * 插入页面元素
     * @internal
@@ -399,6 +401,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -536,6 +539,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -673,6 +677,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
@@ -810,6 +815,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -951,6 +957,9 @@ export class View extends BaseNode {
         return node;
     }
 
+
+
+
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.children as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1092,8 +1101,12 @@ export class View extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除页面元素
+    * @param name 页面元素名称
     */
     removeViewElement(name: string): void;
 
@@ -1139,6 +1152,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1187,6 +1202,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -1235,6 +1252,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1283,6 +1302,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1331,6 +1352,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -1765,16 +1788,22 @@ export class View extends BaseNode {
                 // 子页面内部逻辑过滤
                 if (el.view !== this)
                     return;
-                let jsCode = '';
-                try {
-                    jsCode = el.toJS();
-                } catch (error) {
-
-                }
-                const advanceVar = this.variables?.find((variable) =>
-                    !variable.typeAnnotation && jsCode.startsWith(`this.${variable.name} = `));
-                if (advanceVar && !advanceMap.get(advanceVar)) {
-                    advanceMap.set(advanceVar, el);
+                if (el instanceof Assignment) {
+                    const advanceVar = this.variables?.find((variable) =>
+                        !variable.typeAnnotation && el.left?.name === variable.name);
+                    if (advanceVar && !advanceMap.get(advanceVar)) {
+                        advanceMap.set(advanceVar, el);
+                    }
+                } else if (el instanceof BatchAssignment) {
+                    el.assignmentLines.forEach(({ leftIndex }) => {
+                        const leftCode
+                            = leftIndex.length === 1 ? el.left?.expression?.toEmbeddedTS(shiftState(state, code, { inline: true })) : el.left?.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                        const advanceVar = this.variables?.find((variable) =>
+                            !variable.typeAnnotation && leftCode === variable.name);
+                        if (advanceVar && !advanceMap.get(advanceVar)) {
+                            advanceMap.set(advanceVar, el);
+                        }
+                    });
                 }
             }
         });

package/src/concepts/index__.ts

@@ -98,3 +98,5 @@ export * from './Point__';
 export * from './Rect__';
 export * from './SelectMembers__';
 export * from './AssignmentLine__';
+export * from './FrontendLibrary__';
+export * from './ViewBlock__';

package/src/server/getLogics.ts

@@ -226,6 +226,19 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
                 }));
             }
 
+            app.dependencies.forEach((item) => {
+                const fed = item.frontends.find((item) => item.type === node?.frontend?.type);
+                if (fed?.logics.length > 0) {
+                    systemTree.children.push(new Namespace({
+                        name: 'category',
+                        path: 'dependencies',
+                        title: item.name,
+                        logics: fed.logics,
+                        expanded: false,
+                    }));
+                }
+            });
+
             if (!app.processes.length)
                 systemTree.children.shift();
 

package/src/server/naslServer.ts

@@ -64,6 +64,7 @@ import {
     Frontend,
     NewList,
     NewMap,
+    FrontendLibrary,
     ConfigProperty,
     BindStyle,
     BindDirective,
@@ -298,33 +299,49 @@ export class NaslServer {
             } catch (err) {
             }
         });
-        (module as App).frontends?.forEach((frontend) => {
-            try {
-                const result = frontend.toEmbeddedTSFile();
-                results.push(result);
-                // sourceMap都存在目录级别内容下，在页面层级下去找
-                frontend.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, frontend);
-            } catch (err) {
-                console.log(err);
-            }
-            frontend.variables?.forEach((frontendVariable) => {
+        if (module instanceof App) {
+            module.frontends?.forEach((frontend) => {
                 try {
-                    const result = frontendVariable.toEmbeddedTSFile();
+                    const result = frontend.toEmbeddedTSFile();
                     results.push(result);
                     // sourceMap都存在目录级别内容下，在页面层级下去找
-                    frontendVariable.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, frontendVariable);
+                    frontend.sourceMap = result.sourceMap;
+                    this.file2NodeMap.set(result.filePath, frontend);
                 } catch (err) {
                     console.log(err);
                 }
+                frontend.variables?.forEach((frontendVariable) => {
+                    try {
+                        const result = frontendVariable.toEmbeddedTSFile();
+                        results.push(result);
+                        // sourceMap都存在目录级别内容下，在页面层级下去找
+                        frontendVariable.sourceMap = result.sourceMap;
+                        this.file2NodeMap.set(result.filePath, frontendVariable);
+                    } catch (err) {
+                        console.log(err);
+                    }
+                });
+                // view的生成
+                if (!config.closeViews) {
+                    this.view2TSFile(frontend.views, results);
+                }
+                frontend.componentDependencies?.forEach((item) => this.contentToFile(item, results));
             });
-            // view的生成
-            if (!config.closeViews) {
-                this.view2TSFile(frontend.views, results);
-            }
-            frontend.componentDependencies?.forEach((item) => this.contentToFile(item, results));
-        });
+        } else {
+            module.frontends?.forEach((frontend) => {
+                try {
+                    frontend.logics.forEach((logic) => {
+                        const result = logic.toEmbeddedTSFile();
+                        results.push(result);
+                        // sourceMap都存在目录级别内容下，在页面层级下去找
+                        logic.sourceMap = result.sourceMap;
+                        this.file2NodeMap.set(result.filePath, logic);
+                    });
+                } catch (err) {
+                    console.log(err);
+                }
+            });
+        }
 
         (module as App).dataSources?.forEach((dataSource) => {
             // 本身dataSource也要生成一个文件用于改名
@@ -1104,7 +1121,7 @@ export class NaslServer {
                                     if (Array.isArray(body) && body.length) {
                                         const lastExpression = body[body.length - 1];
                                         diagnostic.node = lastExpression;
-                                        diagnostic.message = `${lastExpression?.toUI()}期望的类型是${maxTypeAnnotation?.headTitle}`;
+                                        diagnostic.message = `匹配：该分支类型与多数类型不一致，将产生Union类型。当前类型：${typeAnnotation?.headTitle}，多数类型：${maxTypeAnnotation?.headTitle}`;
                                         this.baseNodeAssignmentTsError(lastExpression, diagnostic);
                                         diagnostics.push(diagnostic);
                                     }
@@ -1378,7 +1395,12 @@ export class NaslServer {
                                 if (node.logic && node.logic !== nodeIn.logic)
                                     return;
                                 // 跟变量无关的赋值过滤
-                                const jsCode = nodeIn.toJS();
+                                let jsCode = '';
+                                try {
+                                    jsCode = nodeIn.toJS();
+                                } catch (err) {
+                                    console.log(err);
+                                }
                                 if (!jsCode.includes(`${node.name} = `))
                                     return;
                                 // 页面局部变量
@@ -1551,16 +1573,24 @@ export class NaslServer {
                         fileNode?.sourceMap.forEach((valueIn, nodeIn) => {
                             if (!used && nodeIn
                                 && (nodeIn instanceof BatchAssignment || (nodeIn instanceof Assignment && nodeIn.left?.name))
-                                && nodeIn.toJS().includes(`${node.name} = `)) {
-                                used = true;
-                                if (!nodeIn.tsErrorDetail) {
-                                    const diagnostic = {
-                                        node: nodeIn,
-                                        severity: 'error',
-                                        message: `${nodeIn.label}左边 ${node.name} 未设置类型，右边必须为有返回值的内容。`,
-                                    };
-                                    nodeIn.tsErrorDetail = diagnostic;
-                                    diagnostics.push(diagnostic);
+                            ) {
+                                let jsCode = '';
+                                try {
+                                    jsCode = nodeIn.toJS();
+                                } catch (err) {
+                                    console.log(err);
+                                }
+                                if (jsCode.includes(`${node.name} = `)) {
+                                    used = true;
+                                    if (!nodeIn.tsErrorDetail) {
+                                        const diagnostic = {
+                                            node: nodeIn,
+                                            severity: 'error',
+                                            message: `${nodeIn.label}左边 ${node.name} 未设置类型，右边必须为有返回值的内容。`,
+                                        };
+                                        nodeIn.tsErrorDetail = diagnostic;
+                                        diagnostics.push(diagnostic);
+                                    }
                                 }
                             }
                         });
@@ -1762,6 +1792,7 @@ export class NaslServer {
                         'nasl.collection.Map<nasl.core.String, nasl.core.String>',
                         'nasl.collection.Map<nasl.core.String, nasl.core.Text>',
                         'nasl.collection.Map<nasl.core.String, nasl.core.Email>',
+                        'nasl.collection.List<>',
                     ];
                     // 先特殊处理等 类型合并后就可以去掉了
                     if (excludeList.includes(leftType.sortedTypeKey) && excludeList.includes(rightType.sortedTypeKey)) {
@@ -2775,6 +2806,7 @@ export class NaslServer {
             && !(fileNode.parentNode instanceof App)
             && !(fileNode.parentNode instanceof Module)
             && !(fileNode.parentNode instanceof DataSource)
+            && !(fileNode.parentNode instanceof Frontend)
             && !(fileNode instanceof View)
             && !(fileNode instanceof ConfigProperty)
         ) {
@@ -3040,9 +3072,9 @@ export class NaslServer {
             }
             args.push(fileDetail);
         });
-        console.time('请求');
+        // console.time('请求');
         const resultMap: any = (await this.getNaslNodeTypeFull(args)).response;
-        console.timeEnd('请求');
+        // console.timeEnd('请求');
 
         // console.log(resultMap);
 

package/src/server/translator.ts

@@ -537,7 +537,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
     // 赋值左右侧类型不一致, 把文字换一下
     if (/Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'/.exec(text)) {
         if (node instanceof OqlQueryComponent) {
-            tsErrorDetail.message = tsErrorDetail.message.replace('参数类型不一致！传入类型：', '类型不一致！传入类型：').replace('接收类型：', '期待类型：');
+            tsErrorDetail.message = tsErrorDetail.message.replace('参数类型不一致！传入类型：', '类型不一致！传入类型：').replace('接收类型：', '期望类型：');
         } else if (node.parentNode instanceof Assignment) {
             // OQL 的返回类型报错需要转换翻译，其内部 SQL 语句的参数类型报错不转换翻译
             if (node instanceof OqlQueryComponent) {

package/src/service/storage/init.ts

@@ -318,7 +318,7 @@ async function doAction(app: any, actionItem: any) {
             undo: '已撤销操作：',
             redo: '已重做操作：',
         };
-        let msg = actionMap[action as 'undo' | 'redo'];
+        let msg = actionMap[action as 'undo' | 'redo'] || '';
         msg += actionMsg;
         Vue.prototype.$toast.info(msg);
         app._historying = false;