@lcap/nasl 2.12.0 → 2.13.0-beta

package/src/server/createUiTs.ts

@@ -1,5 +1,6 @@
 import { Logic, TypeAnnotation, Param, LogicItem, NumericLiteral, BooleanLiteral, StringLiteral, Identifier, MemberExpression } from '..';
-
+// @ts-ignore
+import trigger from './events.yaml';
 const naslStdlibMap: any = {
     'nasl.core.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.core.ts').default,
     'nasl.collection.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.collection.ts').default,
@@ -14,6 +15,26 @@ const naslStdlibMap: any = {
     'nasl.validation.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.validation.ts').default,
     'nasl.process.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.process.ts').default,
 };
+export let elementsEventsMap: { [componentTagEventName: string]: any} = {};
+
+export function getAllComponentEventMap(allComponent: any) {
+    const eventsMap: { [componentTagEventName: string]: any} = {};
+    for (const i in allComponent) {
+        const item = allComponent[i];
+        if (item.events && Array.isArray(item.events)) {
+            item.events.forEach((eventItem: any) => {
+                const name = `${item.name}-${eventItem.name}`;
+                eventsMap[name] = eventItem;
+            });
+        }
+    }
+    trigger.forEach((item: any) => {
+        eventsMap[item.name] = item;
+    });
+
+    elementsEventsMap = eventsMap;
+    return eventsMap;
+}
 
 export default function formatUiTs(allComponent: any) {
     const indent = (tabSize: number) => ' '.repeat(tabSize * 2);
@@ -81,6 +102,7 @@ export default function formatUiTs(allComponent: any) {
         return logic;
     };
     const elementsLogic: { [componentName: string]: Array<Logic> } = {};
+
     let value = `namespace nasl.ui {
     export class VueComponent {
     }
@@ -106,7 +128,7 @@ export default function formatUiTs(allComponent: any) {
             options?: {
               [propname: string]: any,
               bindAttr?: () => Array<any>,
-              slotDefault?: ()=> Array<any>,
+              slotDefault?: (scope: nasl.ui.ScopeOf<T>) => Array<any>,
         }){super()}
     }
     export type GetItemTypeFromDataSource<T> = T extends nasl.collection.PageOf<infer U> | nasl.collection.List<infer U> | ((...args: any) => nasl.collection.PageOf<infer U> | nasl.collection.List<infer U>) ? U : never;
@@ -190,9 +212,11 @@ export default function formatUiTs(allComponent: any) {
     value += '}\n';
     // console.log(value);
     // console.log(elementsLogic);
+    // const elementsEventsMap = getAllComponentEventMap(allComponent);
     return {
         code: value,
         elementsLogic,
         naslStdlibMap,
+        elementsEventsMap,
     };
 }

package/src/server/events.yaml

@@ -0,0 +1,89 @@
+- name: click
+  title: 点击
+  description: 在元素上按下并释放任意鼠标按钮时触发。 
+  params:
+    - name: $event
+      type: MouseEvent
+      description: 鼠标事件对象
+      schema:
+        $ref: "#/systemTypes/MouseEvent"
+- name: dblclick
+  title: 双击
+  description: 在元素上双击鼠标按钮时触发。 
+  params:
+    - name: $event
+      type: MouseEvent
+      description: 鼠标事件对象
+      schema:
+        $ref: "#/systemTypes/MouseEvent"
+- name: contextmenu
+  title: 右键点击
+  description: 在右键菜单显示前触发。 
+  params:
+    - name: $event
+      type: MouseEvent
+      description: 鼠标事件对象
+      schema:
+        $ref: "#/systemTypes/MouseEvent"
+- name: mousedown
+  title: 鼠标按下
+  description: 在元素上按下任意鼠标按钮时触发。 
+  params:
+    - name: $event
+      type: MouseEvent
+      description: 鼠标事件对象
+      schema:
+        $ref: "#/systemTypes/MouseEvent"
+- name: mouseup
+  title: 鼠标释放
+  description: 在元素上释放任意鼠标按钮时触发。 
+  params:
+    - name: $event
+      type: MouseEvent
+      description: 鼠标事件对象
+      schema:
+        $ref: "#/systemTypes/MouseEvent"
+- name: mouseenter
+  title: 鼠标移入
+  description: 鼠标移入元素时触发。 
+  params:
+    - name: $event
+      type: MouseEvent
+      description: 鼠标事件对象
+      schema:
+        $ref: "#/systemTypes/MouseEvent"
+- name: mouseleave
+  title: 鼠标移出
+  description: 鼠标移出元素时触发。 
+  params:
+    - name: $event
+      type: MouseEvent
+      description: 鼠标事件对象
+      schema:
+        $ref: "#/systemTypes/MouseEvent"
+- name: focus
+  title: 获得焦点
+  description: 获得焦点时触发。
+  params:
+    - name: $event
+      type: FocusEvent
+      description: 焦点事件对象
+      schema:
+        $ref: "#/systemTypes/FocusEvent"
+- name: blur
+  title: 失去焦点
+  description: 失去焦点时触发。
+  params:
+    - name: $event
+      type: FocusEvent
+      description: 焦点事件对象
+      schema:
+        $ref: "#/systemTypes/FocusEvent"
+- name: created
+  title: 进入时
+- name: mounted
+  title: 进入后
+- name: updated
+  title: 更新时
+- name: destroyed
+  title: 离开时

package/src/server/getMemberIdentifier.ts

@@ -1,5 +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, Param, BindAttribute, LogicItem, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty } from '..';
 import naslServer from './naslServer';
+import { getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 interface variableItem {
     text: string;
@@ -10,8 +11,10 @@ interface variableItem {
     expression: MemberExpression | Identifier;
 }
 
-function getCompletionDetailType(displayParts: Array<{ text: string; kind: string }>): TypeAnnotation {
-    // 0: {text: 'let', kind: 'keyword'}
+/**
+ * 把ts返回的详细信息截取成一个类型字符串
+ * @param displayParts  ts返回的key value
+ *  // 0: {text: 'let', kind: 'keyword'}
     // 1: {text: ' ', kind: 'space'}
     // 2: {text: 'bindRoles', kind: 'text'}
     // 3: {text: ':', kind: 'punctuation'}
@@ -19,14 +22,23 @@ function getCompletionDetailType(displayParts: Array<{ text: string; kind: strin
     // 5: {text: 'roles', kind: 'moduleName'}
     // 6: {text: '.', kind: 'punctuation'}
     // 7: {text: 'DEV_AdminRole', kind: 'enumName'}
-    // 8: {text: '[', kind: 'punctuation'}
-    // 9: {text: ']', kind: 'punctuation'}
+ * @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
+ */
+export function getCompletionDetailType(type: string): TypeAnnotation {
     let typeAnnotation;
     try {
         if (type.includes('<') && type.includes('>')) {
@@ -100,7 +112,24 @@ function createType2Annotation(type: string): TypeAnnotation {
     }
     return typeAnnotation;
 }
+export function getPlatformType(tsType: string): string {
+    const namespacePrefix = ['app', 'extensions', 'apis', 'components', 'nasl'];
+    if (tsType === 'String') {
+        return 'nasl.core.String';
+    } else if (tsType === 'Boolean') {
+        return 'nasl.core.Boolean';
+    }
 
+    const strTypes = tsType.split('.');
+    if (strTypes.length) {
+        const first = strTypes[0];
+        // 如果不是这几个前缀就加一个namespace
+        if (!namespacePrefix.includes(first)) {
+            return 'app.' + tsType;
+        }
+    }
+    return tsType;
+}
 /**
  * 把要返回去的数据做一下排序
  * @param result 要返回数据
@@ -139,22 +168,97 @@ function sortFirstVariableData(result: CompletionProperty[], node: BaseNode) {
     newResult.push(...result);
     return newResult;
 }
+export function isNoChildType(type: String) {
+    return type?.startsWith('nasl.core') || type?.startsWith('app.enums');
+}
+function findNode(typeKey: string, node: BaseNode) {
+    let newType: Structure | Entity;
+    if (typeKey.startsWith('nasl.') && typeKey.includes('<')) {
+        const findGenericsIndex = typeKey.indexOf('<');
+        typeKey = typeKey.substring(0, findGenericsIndex);
+        const typeIndex = typeKey.lastIndexOf('.');
+        newType = getNaslNodeByNodeCallee(typeKey.substring(0, typeIndex), typeKey.substring(typeIndex + 1, typeKey.length));
+    } else if (typeKey.startsWith('nasl.')) {
+        const typeIndex = typeKey.lastIndexOf('.');
+        newType = getNaslNodeByNodeCallee(typeKey.substring(0, typeIndex), typeKey.substring(typeIndex + 1, typeKey.length));
+    } else {
+        newType = (node as Identifier)?.app?.findNodeByCompleteName(typeKey);
+    }
+    return newType;
+}
+
+/**
+ * 获取下一级的节点进行递归
+ * @param typeKey 当前节点的类型，主要为了取出内部的 T中的实际类型
+ * @param item 当前节点的内容
+ * @param parent 父级节点的内容
+ * @param node 获取变量框的位置
+ */
+export function nextFindTypeChild(typeKey: string, item: any, parent: any, node: BaseNode) {
+    // 有一个当前树分支的全部节点的node map，用作防止数据无限递归，只保留3层
+    const nodeMap = parent ? parent.nodeMap : new Map();
+    item.nodeMap = nodeMap;
+    const newType = findNode(typeKey, node);
+    if (newType?.properties && newType.properties.length) {
+        // 处理泛型的内容要取到值
+        const StructureJson = newType.toJSON();
+        const newStructure = new Structure(StructureJson);
+        newStructure.properties.forEach((item: StructureProperty | EntityProperty) => {
+            const itemType = item?.typeAnnotation?.typeKey;
+            if (itemType === 'T' && /\<([^()]+)\>/g.exec(typeKey)) {
+                const newTypes = /\<([^()]+)\>/g.exec(typeKey);
+                // 找到当前原来的类型
+                const contentType = getPlatformType(newTypes[1]);
+                const typeNamespace = contentType.substring(0, contentType.lastIndexOf('.'));
+                const typeName = contentType.substring(contentType.lastIndexOf('.') + 1, contentType.length);
+                item.typeAnnotation = new TypeAnnotation({
+                    typeKind: 'reference',
+                    typeNamespace,
+                    typeName,
+                });
+            }
+        });
+        const index = nodeMap.get(newType) || 0;
+        if (index) {
+            nodeMap.set(newType, index + 1);
+        } else {
+            nodeMap.set(newType, 1);
+        }
+        // 最多保留3层
+        if (index < 3) {
+            item.children = formatVariableData(newStructure.properties, node, item);
+        }
+    }
+}
 // 格式化变量数据
 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;
+            item.children = [];
             // 当前结构的typeAnnotation
-            const typeAnnotation = item.completionDetail && getCompletionDetailType(item.completionDetail.displayParts as Array<{ text: string; kind: string }>);
+            let typeAnnotation;
+            // 当前的类型如 app.entitys.entity1 nasl.core.String
+            let typeKey: string;
+
+            if (item.completionDetail) {
+                // 当前节点的完整类型，主要是在有T的内容使用 nasl.list<Enum1> 内部匹配内容给里面子集的T赋值类型
+                const currentType: string = formatTs2TypeString(item.completionDetail.displayParts as Array<{ text: string; kind: string }>);
+                typeAnnotation = getCompletionDetailType(currentType);
+                typeKey = getPlatformType(currentType);
+            } else if (item instanceof StructureProperty) {
+                typeKey = item?.typeAnnotation?.typeKey;
+            }
             // 如果没有父节点就是Identifier
             if (!parent) {
+                // value需要拼接生成
+                item.value = parent ? `${parent.value}.${item.text}` : item.text;
+                item.name = item.text;
                 const identifier = new Identifier({ name: item.name });
                 // 携带上当前的类型
                 identifier.typeAnnotation = typeAnnotation;
                 item.expression = identifier;
             } else {
+                item.value = `${parent.value}.${item.name}`;
                 const memberExpression = new MemberExpression({
                     object: parent.expression,
                     property: new Identifier({ name: item.name }),
@@ -163,19 +267,18 @@ export function formatVariableData(data: unknown | variableItem[], node: BaseNod
                 memberExpression.typeAnnotation = typeAnnotation;
                 item.expression = memberExpression;
             }
-            if (item.children) {
-                item.children = formatVariableData(item.children, node, item);
+            // 如果有类型而且类型不是没有子集的类型，就把他当前的类型拿到
+            if (typeKey && !isNoChildType(typeKey)) {
+                nextFindTypeChild(typeKey, item, parent, node);
             }
+            const completionProperty = new CompletionProperty(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;
             }
+            return completionProperty;
         });
 
         /**
@@ -430,19 +533,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 './getMemberIdentifier';
 function alphaUpper(name: string) {
     if (!name) {
         return '';
@@ -250,26 +251,26 @@ 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;
     };
 }
 
-export function getPreviousTask(node: ProcessElement) {
-    const process = node.process;
+export function getPreviousTask(node: ProcessElement, nodePorcess?: Process) {
+    const process = node.process || nodePorcess;
     const elems = process.elements;
     const elements: ProcessElement[] = [];
     const visitedMap = new WeakMap();
@@ -296,18 +297,19 @@ export function getPreviousTask(node: ProcessElement) {
 }
 
 export function getProcessVariableSuggestions(node: Logic, abandonConstant: boolean = false): CompletionProperty {
-    if (!node.processElement) {
-        return;
-    }
-    const processElem = node.processElement;
+    // if (!node.processElement) {
+    //     return;
+    // }
+    //流程下的callback没有processElement
+    const tempPorcessEle = new ProcessElement({});
+    const processElem = node.processElement || tempPorcessEle;
     const process = node.process;
 
-    const elements: ProcessElement[] = getPreviousTask(processElem);
+    const elements: ProcessElement[] = getPreviousTask(processElem, process);
     const prevtasks = elements.map((us) => {
         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 +323,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 +336,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;
@@ -344,27 +344,33 @@ export function getProcessVariableSuggestions(node: Logic, abandonConstant: bool
     }
 
     if (processElem.type === 'UserTask') {
+        // 任务完成时可以拿到该任务的输出参数
+        let returns: CompletionProperty[] = [];
+        if (node.logic && node.logic.upperNode.name === 'OnClose') {
+            returns = processElem.returns.map(genCompletionProperty([process.name, processElem.name]));
+        }
         const scopeVariable = new CompletionProperty({
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            noFurther: true,
-            children: processElem.constants.map(genCompletionProperty([process.name, processElem.name])),
+            children: [
+                ...returns,
+                ...processElem.constants.map(genCompletionProperty([process.name, processElem.name])),
+            ],
         });
         scopeVariable.isProcess = true;
         scopeVariable.icon = processElem.type;
         processVariables.children.push(scopeVariable);
     }
-    if(processElem.type === 'AutoTask') {
+    if (processElem.type === 'AutoTask') {
         const scopeVariable = new CompletionProperty({
             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])),
-            ]
+            ],
         });
         scopeVariable.isProcess = true;
         scopeVariable.icon = processElem.type;
@@ -457,7 +463,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 +477,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 +491,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 +504,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 +516,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/index.ts

@@ -10,9 +10,11 @@ import {
     getGlobalVariableIdentifier,
     getLiteralsIdentifier,
     getSelectNextCompletionData,
+    getCompletionDetailType,
 } from './getMemberIdentifier';
 import naslServer from './naslServer';
 import './extendBaseNode';
+import { getAllComponentEventMap } from './createUiTs';
 
 const server: any = {
     ...naslServer,
@@ -31,5 +33,7 @@ const server: any = {
     getEnumsIdentifier,
     getGlobalVariableIdentifier,
     getLiteralsIdentifier,
+    getAllComponentEventMap,
+    getCompletionDetailType,
 };
 export default server;

package/src/server/naslServer.ts

@@ -56,6 +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';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
     Entity: 3,
@@ -433,7 +434,13 @@ const naslServer = {
             return [{ title: '基础类型', children: [primitiveTypeList[4]] }];
         }
     },
-    async getDataSchemaType(node: BaseNode) {
+    /**
+     * 获取表单的dataschema类型
+     * @param node 当前表单节点
+     * @param allType 是不是需要全部类型 默认不要
+     * @returns 全部类型的str 或者 最后一个.后的内容
+     */
+    async getDataSchemaType(node: BaseNode, allType = false) {
         if (!(node instanceof ViewElement))
             return;
         const { currentSource, fileNode } = naslServer.getCurrentSource(node);
@@ -445,13 +452,27 @@ const naslServer = {
         if (quickInfo.responseRequired) {
             const displayString = quickInfo?.response?.displayString || '';
             const flag = displayString.includes('<') && displayString.includes('>');
+            const types = /\<([^()]+)\>/g.exec(displayString);
+            let typeStr = types[1];
             if (flag) {
                 let str = '';
-                const types = naslServer.getDisplayString2Type(displayString);
-                if (Array.isArray(types) && types.length) {
-                    const type = types[0];
-                    str = type === 'any' || type === 'unknown' || type === 'never' ? '' : type;
+                // 取出T的值
+                typeStr = getPlatformType(typeStr);
+                // 如果要全量的内容
+                if (allType) {
+                    return typeStr;
+                }
+                // 取出剩下的剩下的类型的最后一项
+                if (/\<([^()]+)\>/g.exec(typeStr)) {
+                    str = typeStr;
+                } else if (typeStr.includes('.')) {
+                    const strs = typeStr.split('.');
+                    const type = strs[strs.length - 1];
+                    str = type;
+                } else {
+                    str = typeStr;
                 }
+                str = str === 'any' || str === 'unknown' || str === 'never' ? '' : str;
                 return str;
             }
         }
@@ -498,7 +519,20 @@ const naslServer = {
             // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
             const oldRecord = diagnosticManager.getRecord(record.id);
             oldRecord?.semanticDiagnostics.forEach((item) => {
-                item.node ? (item.node.tsErrorDetail = undefined) : '';
+                if (item.node) {
+                    item.node.tsErrorDetail = undefined;
+                    // 如果logic中有报错就把标识置为true
+                    if ((item.node as any).logic) {
+                        (item.node as any).logic.haveError = false;
+                    }
+                }
+            });
+
+            // 清空一些状态
+            oldRecord?.suggestionDiagnostics.forEach((item) => {
+                if (item.node && item.node instanceof Logic) {
+                    item.node.isSmpty = false;
+                }
             });
             // 语义诊断
             if (isChangeInterface) {
@@ -522,11 +556,10 @@ const naslServer = {
             //     // logic在for循环中，不展示any提示
             //     record.suggestionDiagnostics = record.suggestionDiagnostics.filter((item) => !item.text.includes(`implicitly has an 'any' type, but a better type may be inferred from usage.`));
             // }
-            // record.suggestionDiagnostics = record.suggestionDiagnostics
-            //     .map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, node.sourceMap))
-            //     .filter((diag) => !!diag);
-            record.suggestionDiagnostics = [];
-            // 语法诊断暂时不需要
+            record.suggestionDiagnostics = record.suggestionDiagnostics
+                .filter((item) => { return [`'$LogicEmpty' is declared but its value is never read.`].includes(item.text); })
+                .map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, node as FileNode))
+                .filter((diag) => !!diag);
         });
 
         return records;
@@ -1265,8 +1298,9 @@ const naslServer = {
             App.emit('collect:start', {
                 actionMsg: '增加逻辑参数',
             });
+            const index = node.getIndexOfParent();
             node.create({
-                index: 0,
+                index,
                 parentNode: parantNode,
                 parentKey: node.parentKey,
             });