@lcap/nasl 2.13.0-beta.2 → 2.13.1-beta.1

package/src/server/getMemberIdentifier.ts

@@ -1,250 +1,6 @@
-import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute, LogicItem, TypeAnnotation } from '..';
+import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, BindAttribute, LogicItem } from '..';
 import naslServer from './naslServer';
-
-interface variableItem {
-    text: string;
-    completionDetail: any;
-    children?: variableItem[] | any;
-    name?: string;
-    value?: string;
-    expression: MemberExpression | Identifier;
-}
-
-/**
- * 把ts返回的详细信息截取成一个类型字符串
- * @param displayParts  ts返回的key value
- *  // 0: {text: 'let', kind: 'keyword'}
-    // 1: {text: ' ', kind: 'space'}
-    // 2: {text: 'bindRoles', kind: 'text'}
-    // 3: {text: ':', kind: 'punctuation'}
-    // 4: {text: ' ', kind: 'space'}
-    // 5: {text: 'roles', kind: 'moduleName'}
-    // 6: {text: '.', kind: 'punctuation'}
-    // 7: {text: 'DEV_AdminRole', kind: 'enumName'}
- * @returns type roles.DEV_AdminRole
- */
-function formatTs2TypeString(displayParts: Array<{ text: string; kind: string }>) {
-    let str = '';
-    displayParts.forEach((item) => {
-        str += item.text;
-    });
-    const strTypes = str.split(': ');
-    const type = strTypes[1];
-    return type;
-}
-/**
- * 把当前类型转成typeAnnotation
- * @param type app
- * @returns typeAnnotation
- */
-function getCompletionDetailType(type: string): TypeAnnotation {
-    let typeAnnotation;
-    try {
-        if (type.includes('<') && type.includes('>')) {
-            // 泛型的处理
-            typeAnnotation = createGenericTypeAnnotation(type);
-        } else {
-            typeAnnotation = createType2Annotation(type);
-        }
-    } catch (err) {
-        console.log(err);
-    }
-    return typeAnnotation;
-}
-
-function createGenericTypeAnnotation(type: string) {
-    // 取出匹配的内容
-
-    const childType = type.substring(0, type.indexOf('<'));
-    const typeAnnotation = createType2Annotation(childType);
-    // 如果还有匹配到的多层泛型;
-    // 取出匹配到的内容
-    const types = /\<([^()]+)\>/g.exec(type);
-    const newtext = types[1];
-    // 把匹配的值，的内容在，检索一遍，看是不是泛型套泛型
-    const newTypes = /\<([^()]+)\>/g.exec(newtext);
-    // 如果是的话就去递归
-    if (newTypes) {
-        const argTypeAnnotation = createGenericTypeAnnotation(newtext);
-        typeAnnotation.typeArguments = [argTypeAnnotation];
-    } else {
-        // 如果不是就创造内部的真正类型
-        const argTypeAnnotation = createType2Annotation(newtext);
-        typeAnnotation.typeArguments = [argTypeAnnotation];
-    }
-    return typeAnnotation;
-}
-function createType2Annotation(type: string): TypeAnnotation {
-    let typeAnnotation;
-    // 没有泛型类型的
-    const types = type.split('.');
-    if (types.length === 1) {
-        typeAnnotation = TypeAnnotation.createPrimitive(types[0]);
-    } else {
-        if (type.startsWith('nasl.core')) {
-            typeAnnotation = TypeAnnotation.createPrimitive(types[types.length - 1]);
-        } else if (type.startsWith('nasl.ui')) {
-            typeAnnotation = TypeAnnotation.createReference(types[types.length - 1], {
-                typeNamespace: 'nasl.ui',
-            });
-        } else if (type.startsWith('nasl.process')) {
-            typeAnnotation = TypeAnnotation.createReference(types[types.length - 1], {
-                typeNamespace: 'nasl.process',
-            });
-        } else if (type.startsWith('nasl.collection')) {
-            typeAnnotation = TypeAnnotation.createGeneric(types[types.length - 1], {
-                typeNamespace: 'nasl.collection',
-            });
-        } else if (type.startsWith('entities.')) {
-            typeAnnotation = TypeAnnotation.createReference(types[types.length - 1], {
-                typeNamespace: 'app.entities',
-            });
-        } else if (type.startsWith('structures.')) {
-            typeAnnotation = TypeAnnotation.createReference(types[types.length - 1], {
-                typeNamespace: 'app.structures',
-            });
-        } else if (type.startsWith('enums.')) {
-            typeAnnotation = TypeAnnotation.createReference(types[types.length - 1], {
-                typeNamespace: 'app.enums',
-            });
-        }
-    }
-    return typeAnnotation;
-}
-export function getPlatformType(tsType: string): string {
-    const namespacePrefix = ['app', 'extensions', 'apis', 'components', 'nasl'];
-    if (tsType === 'String') {
-        return 'nasl.core.String';
-    }
-
-    const strTypes = tsType.split('.');
-    if (strTypes.length) {
-        const first = strTypes[0];
-        // 如果不是这几个前缀就加一个namespace
-        if (!namespacePrefix.includes(first)) {
-            return 'app.' + tsType;
-        }
-    }
-    return tsType;
-}
-/**
- * 把要返回去的数据做一下排序
- * @param result 要返回数据
- * @param node 当前内容的上下级
- * @returns 返回排序后的数组
- * 因为ts会按照 a-z的顺序进行排序
- * 但是影响用户体验，需要先按照页面排序，其次按照logic进行排序
- * 流程的韬哥自己解决了，所以先解决这两部分
- */
-function sortFirstVariableData(result: CompletionProperty[], node: BaseNode) {
-    const newResult: CompletionProperty[] = [];
-    const logic = (node as Param).logic;
-    const view = (node as Param).view;
-    if (view) {
-        const { params, variables } = view;
-        const list = [...params, ...variables];
-        list.forEach((item) => {
-            const findIndex = result.findIndex((findItem) => findItem.name === item.name);
-            if (findIndex === 0 || findIndex) {
-                newResult.push(result[findIndex]);
-                result.splice(findIndex, 1);
-            }
-        });
-    }
-    if (logic) {
-        const { params, returns, variables } = logic;
-        const list = [...params, ...returns, ...variables];
-        list.forEach((item) => {
-            const findIndex = result.findIndex((findItem) => findItem.name === item.name);
-            if (findIndex === 0 || findIndex) {
-                newResult.push(result[findIndex]);
-                result.splice(findIndex, 1);
-            }
-        });
-    }
-    newResult.push(...result);
-    return newResult;
-}
-// 格式化变量数据
-export function formatVariableData(data: unknown | variableItem[], node: BaseNode, parent?: any) {
-    if (Array.isArray(data)) {
-        let result = data.map((item) => {
-            // value需要拼接生成
-            item.value = parent ? `${parent.value}.${item.text}` : item.text;
-            item.name = item.text;
-            // 当前结构的typeAnnotation
-            let typeAnnotation;
-            let type;
-
-            if (item.completionDetail) {
-                let type = formatTs2TypeString(item.completionDetail.displayParts as Array<{ text: string; kind: string }>);
-                typeAnnotation = getCompletionDetailType(type);
-                type = getPlatformType(type);
-            }
-            // 如果没有父节点就是Identifier
-            if (!parent) {
-                const identifier = new Identifier({ name: item.name });
-                // 携带上当前的类型
-                identifier.typeAnnotation = typeAnnotation;
-                item.expression = identifier;
-            } else {
-                const memberExpression = new MemberExpression({
-                    object: parent.expression,
-                    property: new Identifier({ name: item.name }),
-                });
-                // 携带上当前的类型
-                memberExpression.typeAnnotation = typeAnnotation;
-                item.expression = memberExpression;
-            }
-            if (item.children) {
-                item.children = formatVariableData(item.children, node, item);
-            }
-            if (!parent) {
-                const completionProperty = new CompletionProperty(item);
-                // 变量 param return 在这里添加图标
-                completionProperty.icon = getNodeiconFromLogic(completionProperty, node);
-                return completionProperty;
-            } else {
-                const completionProperty = new CompletionProperty(item);
-                completionProperty.icon = 'refProperty';
-                return completionProperty;
-            }
-        });
-
-        /**
-         * 排序result
-         * 如果没有父级就是第一集就排序一下当前result，用户体验优化
-        */
-        if (!parent) {
-            result = sortFirstVariableData(result, node);
-        }
-        return result;
-    }
-}
-// 从logic获取节点的icon
-function getNodeiconFromLogic(completionProperty: CompletionProperty, node: BaseNode): string {
-    const logic = (node as Param).logic;
-    const view = (node as Param).view;
-    if (view) {
-        const { params } = view;
-        if (params.find((item) => item.name === completionProperty.name))
-            return 'param';
-    }
-    if (logic) {
-        const { params, returns } = logic;
-        if (params.find((item) => item.name === completionProperty.name))
-            return 'param';
-
-        if (returns.find((item) => item.name === completionProperty.name))
-            return 'return';
-        // if (variables.find((item) => item.name === completionProperty.name))
-        // return 'variable';
-
-        // 其余的全部按variable展示
-        return 'variable';
-    }
-    return 'variable';
-}
+import { formatVariableData } from './formatTsUtils';
 
 // 简单实现一版本的格式化nums
 function formatEnums(enums: Array<Enum>) {
@@ -409,7 +165,7 @@ function getCurrentLogic(node: BaseNode,
             completionProperty.icon = 'logic';
             return completionProperty;
         });
-        result.push({ name: '逻辑', children: logicVariable, expanded: true, icon: 'category' });
+        result.push({ name: '逻辑', children: logicVariable, expanded: false, icon: 'category' });
     }
 }
 
@@ -436,10 +192,10 @@ export async function getMemberIdentifier(node: BaseNode) {
 
         // 这个可能需要自己算一下
         const result = [
-            { name: '字面量', children: literals, expanded: true, icon: 'category' },
-            { name: '枚举', children: newEnums, expanded: true, icon: 'category' },
-            { name: '变量', children: completionData, expanded: true, icon: 'category' },
-            { name: '公共变量', children: globalVariable, expanded: true, icon: 'category' },
+            { name: '字面量', children: literals, expanded: false, icon: 'category' },
+            { name: '枚举', children: newEnums, expanded: false, icon: 'category' },
+            { name: '变量', children: completionData, expanded: false, icon: 'category' },
+            { name: '公共变量', children: globalVariable, expanded: false, icon: 'category' },
             // { name: '流程变量', children: [] },
         ];
         getCurrentLogic(node, result);
@@ -463,19 +219,9 @@ export function getEnumsIdentifier(node: BaseNode): CompletionProperty[] {
 // 获取变量
 export async function getVariableIdentifier(node: BaseNode): Promise<CompletionProperty[]> {
     let completionData: CompletionProperty[] = [new CompletionProperty({})];
-    if (node instanceof Identifier || node instanceof MemberExpression) {
-        const value = (node as Identifier | MemberExpression).getValue();
-        if (value) {
-            const completion = (await naslServer.getValueSelectCompletion(node, value)) as variableItem[];
-            completionData = formatVariableData(completion, node);
-        } else {
-            const nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
-            completionData = formatVariableData(nextCompletion, node);
-        }
-    } else {
-        const nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
-        completionData = formatVariableData(nextCompletion, node);
-    }
+    // 只获取第一层内容
+    const nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
+    completionData = formatVariableData(nextCompletion, node);
     return completionData;
 }
 

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 './formatTsUtils';
 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

@@ -56,7 +56,7 @@ import { DiagnosticRecord, Diagnostic, default as diagnosticManager } from '../m
 import formatUiTs from './createUiTs';
 import { primitiveTypeList } from '../concepts/basics/types/coreTypeList';
 import { traverse } from '../utils';
-import { getPlatformType } from './getMemberIdentifier';
+import { getPlatformType } from './formatTsUtils';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
     Entity: 3,
@@ -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/server/stdlib/nasl.annotation.ts

@@ -0,0 +1,4 @@
+declare namespace nasl.annotation {
+    export function Entity():any;
+    export function EntityRelation(property: any):any;
+}

package/src/server/stdlib/nasl.auth.ts

@@ -0,0 +1,31 @@
+declare namespace nasl.auth {
+    export function hasAuth(authPath: nasl.core.String): nasl.core.Boolean;
+    export function login(): Promise<void>;
+    export function logout(): Promise<void>;
+    export function encryptByAES(authPath: nasl.core.String): nasl.core.String;
+    export function decryptByAES(authPath: nasl.core.String): nasl.core.String;
+
+    export const userInfo: {
+        Status: nasl.core.String,
+        UserInfoExtend: {
+            Company: nasl.core.String,
+            JobLevel: nasl.core.String,
+            JobNum: nasl.core.String,
+            JobYear: nasl.core.String,
+            RealName: nasl.core.String,
+            NickName: nasl.core.String,
+            NameAndEmail: nasl.core.String,
+            Position: nasl.core.String,
+            Department: nasl.core.String,
+            EmployeeId: nasl.core.String,
+        },
+        UserName: nasl.core.String,
+        Email: nasl.core.String,
+        UserId: nasl.core.String,
+        Phone: nasl.core.String,
+        CreateTime: nasl.core.Long,
+        UpdateTime: nasl.core.Long,
+        LoginCount: nasl.core.Integer,
+        Source: nasl.core.String,
+    }
+}

package/src/server/stdlib/nasl.browser.ts

@@ -0,0 +1,5 @@
+declare namespace nasl.browser {
+    export function requestFullscreen(): Promise<void>;
+    export function exitFullscreen(): Promise<void>;
+    export function getDistance(Point1: nasl.core.String, Point2: nasl.core.String): nasl.core.Double;
+}