@lcap/nasl 2.13.0-beta.2 → 2.13.1

package/src/server/getProcesses.ts

@@ -1,6 +1,7 @@
 import Constant from '@nasl/concepts/Constant__';
 import { CompletionProperty, Process, ProcessElement, Namespace, Logic, TypeAnnotation, Return, Variable, StructureProperty, Param, Identifier, MemberExpression, LogicItem, App, BaseNode, Structure, Entity, EntityProperty } from '..';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
+import { isNoChildType, nextFindTypeChild } from './getMemberIdentifier';
 function alphaUpper(name: string) {
     if (!name) {
         return '';
@@ -250,20 +251,20 @@ export function genCompletionProperty(prefix: string[] = []):(v: Variable | Para
         if (t.length) {
             prevalue = `${t.join('.')}.`;
         }
-        const hasChild = ['reference', 'generic'].includes(v.typeAnnotation.typeKind);
-        const cp = new CompletionProperty({
+        const noChildType = isNoChildType(v.typeAnnotation.typeKey);
+        const item = {
             expression: m || p,
-            noFurther: !hasChild,
             name: v.name,
             value: prevalue + v.name,
+        };
 
-        });
-        console.log(cp.value);
-        cp.icon = v.concept;
-
-        if (hasChild) {
-            cp.children = [new CompletionProperty()];
+        if (!noChildType) {
+            nextFindTypeChild(v.typeAnnotation.typeKey, item, null, v);
         }
+
+        const cp = new CompletionProperty(item);
+        console.log(cp.value, v);
+        cp.icon = v.concept;
         return cp;
     };
 }
@@ -307,7 +308,6 @@ export function getProcessVariableSuggestions(node: Logic, abandonConstant: bool
         const cp = new CompletionProperty({
             name: us.name,
             value: us.name,
-            noFurther: true,
             children: [
                 ...us.returns.map(genCompletionProperty([process.name, us.name])),
                 ...(abandonConstant ? [] : us.constants.map(genCompletionProperty([process.name, us.name]))),
@@ -321,7 +321,6 @@ export function getProcessVariableSuggestions(node: Logic, abandonConstant: bool
     const processVariables = new CompletionProperty({
         name: process.name,
         value: process.name,
-        noFurther: true,
         children: [
             ...process.params.map(genCompletionProperty([process.name])),
             ...process.returns.map(genCompletionProperty([process.name])),
@@ -335,7 +334,6 @@ export function getProcessVariableSuggestions(node: Logic, abandonConstant: bool
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            noFurther: true,
             children: processElem.variables.map(genCompletionProperty([process.name, processElem.name])),
         });
         scopeVariable.isProcess = true;
@@ -348,7 +346,6 @@ export function getProcessVariableSuggestions(node: Logic, abandonConstant: bool
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            noFurther: true,
             children: processElem.constants.map(genCompletionProperty([process.name, processElem.name])),
         });
         scopeVariable.isProcess = true;
@@ -360,7 +357,6 @@ export function getProcessVariableSuggestions(node: Logic, abandonConstant: bool
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            noFurther: true,
             children: [
                 ...processElem.variables.map(genCompletionProperty([process.name, processElem.name])),
                 ...processElem.returns.map(genCompletionProperty([process.name, processElem.name])),
@@ -457,7 +453,6 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
         const cp = new CompletionProperty({
             name: us.name,
             value: us.name,
-            noFurther: true,
             children: [
                 ...us.returns.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, us.name], [])),
                ...us.constants.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, us.name], [])),
@@ -472,7 +467,6 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
     const processVariables = new CompletionProperty({
         name: process.name,
         value: process.name,
-        noFurther: true,
         children: [
             ...process.params.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name], [])),
             ...process.returns.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name], [])),
@@ -487,7 +481,6 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            noFurther: true,
             children: processElem.variables.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),
         });
         scopeVariable.expanded = true;
@@ -501,7 +494,6 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            noFurther: true,
             children: processElem.constants.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),
         });
         scopeVariable.expanded = true;
@@ -514,7 +506,6 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            noFurther: true,
             children: [
                 ...processElem.variables.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),
                 ...processElem.returns.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),

package/src/server/naslServer.ts

@@ -146,7 +146,6 @@ const naslServer = {
                 structure.sourceMap = result.sourceMap;
                 this.file2NodeMap.set(result.filePath, structure);
             } catch (err) {
-                console.log(err);
             }
         });
         (module as App).dataSources?.forEach((dataSource) => {
@@ -158,7 +157,6 @@ const naslServer = {
                 dataSource.sourceMap = result.sourceMap;
                 this.file2NodeMap.set(result.filePath, dataSource);
             } catch (err) {
-                console.log(err);
             }
             dataSource.entities.forEach((entity) => {
                 try {
@@ -168,7 +166,6 @@ const naslServer = {
                     entity.sourceMap = result.sourceMap;
                     this.file2NodeMap.set(result.filePath, entity);
                 } catch (err) {
-                    console.log(err);
                 }
             });
         });
@@ -181,7 +178,6 @@ const naslServer = {
                 _interface.sourceMap = result.sourceMap;
                 this.file2NodeMap.set(result.filePath, _interface);
             } catch (err) {
-                console.log(err);
             }
         });
         module.enums.forEach((_enum) => {
@@ -192,7 +188,6 @@ const naslServer = {
                 _enum.sourceMap = result.sourceMap;
                 this.file2NodeMap.set(result.filePath, _enum);
             } catch (err) {
-                console.log(err);
             }
         });
         module.logics.forEach((logic) => {
@@ -204,7 +199,6 @@ const naslServer = {
                 logic.sourceMap = result.sourceMap;
                 this.file2NodeMap.set(result.filePath, logic);
             } catch (err) {
-                console.log(err);
             }
         });
 
@@ -218,7 +212,6 @@ const naslServer = {
                 process.sourceMap = result.sourceMap;
                 this.file2NodeMap.set(result.filePath, process);
             } catch (err) {
-                console.log(err);
             }
         });
 
@@ -231,7 +224,6 @@ const naslServer = {
                     role.sourceMap = result.sourceMap;
                     this.file2NodeMap.set(result.filePath, role);
                 } catch (err) {
-                    console.log(err);
                 }
             });
         }
@@ -249,7 +241,6 @@ const naslServer = {
                         naslServer.view2TSFile(view.children, results);
                     }
                 } catch (err) {
-                    console.log(err);
                 }
             });
         }
@@ -391,6 +382,11 @@ const naslServer = {
         });
         return typeList;
     },
+    /**
+     * 获取 Convert 的可选类型
+     * @param node 传入当前已经选择的变量
+     * @returns 可以选择的类型数组
+     */
     async getTypeQuickinfo(node: BaseNode) {
         if (node && node instanceof BaseNode) {
             const callFunction = node.parentNode.parentNode;
@@ -478,9 +474,20 @@ const naslServer = {
         }
         return '';
     },
+    /**
+     * ts的 quickInfo方法，查询指定位置的详情
+     * @param args 文件信息数组
+     * @returns 查询到的
+     */
     _getTypeQuickinfo(args: any) {
         return this.messager.requestCommand('quickInfo', args) as unknown as { responseRequired: boolean; response: tsProtocol.QuickInfoResponseBody };
     },
+    /**
+     * 获取已经选中的内容的 下一级的内容
+     * @param node 已经选中的内容
+     * @param noFilterList 不过滤的key 的数据
+     * @returns 可以选择的数据数组
+     */
     getSelectNextCompletion(node: BaseNode, noFilterList?: Array<string>) {
         const { currentSource, fileNode } = naslServer.getCurrentSource(node);
         // console.log(currentSource, fileNode);
@@ -500,6 +507,11 @@ const naslServer = {
     _getSelectNextCompletion(args: any) {
         return this.messager.requestCommand('getSelectNextCompletion', args);
     },
+    /**
+     * 获取诊断信息
+     * @param fileNames 多个文件名
+     * @returns 诊断结果
+     */
     async getDiagnosticRecords(fileNames?: Array<string>): Promise<Array<DiagnosticRecord>> {
         const records = (await this.messager.requestCommand('getDiagnosticRecords', fileNames)) as Array<DiagnosticRecord>;
         return this._resolveDiagnosticRecords(records);
@@ -508,6 +520,11 @@ const naslServer = {
         const records = await this.getDiagnosticRecords(fileNames);
         // diagnosticManager.pushAll(records);
     },
+    /**
+     * 处理诊断结果
+     * @param records 结果
+     * @returns 过滤或者转换后的诊断结果
+     */
     _resolveDiagnosticRecords(records: Array<DiagnosticRecord>) {
         records.forEach((record) => {
             const node = this.file2NodeMap.get(record.filePath);
@@ -552,6 +569,11 @@ const naslServer = {
 
         return records;
     },
+    /**
+     * 额外的诊断
+     * @param fileNode 文件级别的节点
+     * @returns 诊断结果
+     */
     _attachDiagnostics(fileNode: BaseNode): Diagnostic[] {
         const diagnostics: Diagnostic[] = [];
         if (fileNode instanceof View) {
@@ -656,6 +678,12 @@ const naslServer = {
             }, 2000);
         }
     },
+    /**
+     * 单个问题的诊断处理
+     * @param diagnostic 诊断问题
+     * @param fileNode 页面节点
+     * @returns 处理后的结果
+     */
     _resolveDiagnostic(diagnostic: tsProtocol.DiagnosticWithFileName, fileNode: FileNode): Diagnostic {
         const minRange = this._findMinRange(diagnostic, fileNode);
         const tsErrorDetail = {
@@ -676,6 +704,12 @@ const naslServer = {
             };
         }
     },
+    /**
+     * 通过节点诊断反过来查找节点
+     * @param diagnostic 诊断信息
+     * @param fileNode 文件级别节点
+     * @returns 找到的节点
+     */
     _findMinRange(diagnostic: tsProtocol.DiagnosticWithFileName | tsProtocol.ReferencesResponseItem, fileNode: FileNode) {
         let minRange: MinRange;
         const sourceMap: SourceMap = fileNode.sourceMap;
@@ -717,6 +751,11 @@ const naslServer = {
         }
         return minRange;
     },
+    /**
+     * 查看当前节点是不是有引用
+     * @param node 节点
+     * @returns 查找到的数组
+     */
     async _isHaveRef(node: BaseNode) {
         const { currentSource, fileNode } = naslServer.getCurrentSource(node);
         let refsList: tsProtocol.ReferencesResponseItem[] = [];
@@ -1223,7 +1262,10 @@ const naslServer = {
                     }
                     // params修改 查找View不需要修改
                     // 逻辑改名，触发了在定义里面的，element定义，的值，直接掠过
-                    if (minRange.node instanceof View && (node instanceof Logic || node instanceof Param)) {
+                    /**
+                        修改枚举名 引发查找到view ，以为viewElement有一个类型，但是渲染了两次，就过滤掉找到view的 内容
+                     */
+                    if (minRange.node instanceof View && (node instanceof Logic || node instanceof Param || node instanceof Enum)) {
                         /**
                          * 这里过滤一下，一些查找引用，重复的内容，直接屏蔽掉，防止操作重复
                          * 因为在生成的时候 ，可能弄了一些副作用的引用
@@ -1246,6 +1288,10 @@ const naslServer = {
                     if (minRange.node instanceof Logic && node !== minRange.node) {
                         return null;
                     }
+
+                    if (node instanceof Param && minRange.node instanceof Interface) {
+                        return null;
+                    }
                 } else {
                     console.log('没找到节点需要排查');
                     console.log(record, fileNode.sourceMap);
@@ -1449,7 +1495,7 @@ const naslServer = {
      * @returns 当前节点，最后输出所有节点
      */
     _recursionCreateResult(root: QuoteNode, map: Map<QuoteNode, Array<QuoteNode>>) {
-        const children = map.get(root).map((item: QuoteNode) => naslServer._recursionCreateResult(item, map));
+        const children = (map.get(root) || []).map((item: QuoteNode) => naslServer._recursionCreateResult(item, map));
         if (children && children.length) {
             root.children = children;
         }

package/src/templator/genQueryComponent.ts

@@ -251,14 +251,6 @@ export async function joinEntity(callQueryComponent: CallQueryComponent, entity:
                 propertyName: joinInfo.rightProperty.name,
             }),
         }));
-        const structureProperty = StructureProperty.from(NaslNode.StructureProperty({
-            name: utils.firstLowerCase(entity.name),
-            typeAnnotation: NaslTypeAnnotation.Reference({
-                typeNamespace: entity.getNamespace(),
-                typeName: entity.name,
-            }),
-        }), recordStructure, 'properties');
-        recordStructure.addProperty(structureProperty);
     } else {
         queryJoinExpression.onExpressions.push(NaslLogicItem.BinaryExpression({
             operator: '==',
@@ -274,6 +266,14 @@ export async function joinEntity(callQueryComponent: CallQueryComponent, entity:
             }),
         }));
     }
+    const structureProperty = StructureProperty.from(NaslNode.StructureProperty({
+        name: utils.firstLowerCase(entity.name),
+        typeAnnotation: NaslTypeAnnotation.Reference({
+            typeNamespace: entity.getNamespace(),
+            typeName: entity.name,
+        }),
+    }), recordStructure, 'properties');
+    recordStructure.addProperty(structureProperty);
     const newJoinPartLogicItem = QueryJoinExpression.from(queryJoinExpression, callQueryComponent, 'joinParts');
     from.addJoinPart(newJoinPartLogicItem);
     callQueryComponent.saveStructure();