@lcap/nasl 3.6.0-alpha.6 → 3.6.0-alpha.7

package/src/server/createUiTs.ts

@@ -1,7 +1,8 @@
 import { Logic, TypeAnnotation, Param, LogicItem, NumericLiteral, BooleanLiteral, StringLiteral, Identifier, MemberExpression } from '..';
+import * as utils from '../utils';
 import { trigger } from './event';
 
-export let elementsEventsMap: { [componentTagEventName: string]: any } = {};
+export const elementsEventsMap: { [componentTagEventName: string]: any } = {};
 
 export function getAllComponentEventMap(allComponent: any) {
   const eventsMap: { [componentTagEventName: string]: any } = {};
@@ -18,15 +19,17 @@ export function getAllComponentEventMap(allComponent: any) {
     eventsMap[item.name] = item;
   });
 
-  elementsEventsMap = eventsMap;
+  // elementsEventsMap = eventsMap;
+  Object.assign(elementsEventsMap, eventsMap)
+
   return eventsMap;
 }
 
+const toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
+
 export default function formatUiTs(allComponent: any) {
   const indent = (tabSize: number) => ' '.repeat(tabSize * 2);
 
-  const toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
-
   const toNaslType = (type: string) => {
     if (type === 'number') return 'nasl.core.Long';
     if (type === 'string') return 'nasl.core.String';
@@ -61,7 +64,8 @@ export default function formatUiTs(allComponent: any) {
         }
         let typeAnnotation = null;
         const { name, type } = param;
-        if (type === 'number') typeAnnotation = TypeAnnotation.createPrimitive('Long');
+        if(param.typeAnnotation !== undefined) typeAnnotation = new TypeAnnotation(param.typeAnnotation);
+        else if (type === 'number') typeAnnotation = TypeAnnotation.createPrimitive('Long');
         else if (type === 'string') typeAnnotation = TypeAnnotation.createPrimitive('String');
         else if (type === 'boolean') typeAnnotation = TypeAnnotation.createPrimitive('Boolean');
         else if (type === 'Array<string>')
@@ -76,6 +80,7 @@ export default function formatUiTs(allComponent: any) {
           typeAnnotation,
           defaultExpression: createDefault(param),
           required,
+          defaultValue: param.defaultValue,
         });
       }),
     });
@@ -83,66 +88,78 @@ export default function formatUiTs(allComponent: any) {
   };
   const elementsLogic: { [componentName: string]: Array<Logic> } = {};
 
-  let value = `namespace nasl.ui {
-    export class VueComponent {
-    }
-    export class lRoot<T> extends VueComponent{
-        constructor(
-            options?: {
-              [propname: string]: any,
-              bindAttr?: () => Array<any>,
-              slotDefault?: ()=> Array<any>,
-        }){super()}
-    }
+  let value = `declare namespace nasl.ui {\n`;
 
-    class BaseDomEl<T> extends VueComponent {
-        constructor(
-        options?: {
-            [propname: string]: any,
-            bindAttr?: () => Array<any>,
-            slotDefault?: () => Array<any>,
-            click?: (event: any) => Array<any>,
-        }) { super() }
-    }
-
-    export class div<T> extends BaseDomEl<T> {}
-    export class span<T> extends BaseDomEl<T> {}
-    export class h1<T> extends BaseDomEl<T> {}
-    export class h2<T> extends BaseDomEl<T> {}
-    export class h3<T> extends BaseDomEl<T> {}
-    export class h4<T> extends BaseDomEl<T> {}
-    export class h5<T> extends BaseDomEl<T> {}
-    export class img<T> extends BaseDomEl<T> {}
-    export class br<T> extends BaseDomEl<T> {}
-    export class a<T> extends BaseDomEl<T> {}
-
-    export class template<T> extends VueComponent {
-        constructor(
-            options?: {
-              [propname: string]: any,
-              bindAttr?: () => Array<any>,
-              slotDefault?: (current: nasl.ui.Current<T>) => Array<any>,
-        }){super()}
-    }
-    export type GetItemTypeFromDataSource<T> = T extends { list: nasl.collection.List<infer U> } | nasl.collection.List<infer U> | ((...args: any) => { list: nasl.collection.List<infer U> } | nasl.collection.List<infer U>) ? U : never;
-    \n`;
   for (const i in allComponent) {
     const item = allComponent[i];
-    const componentName = toHump(item.name);
+    const componentName = utils.kebab2Pascal(item.name);
     if (!componentName) continue;
     // console.log(item);
-    if (componentName === 'uTableViewColumnDynamic') {
-      value += `export class ${componentName}<T, T1> extends VueComponent{\n
-                constructor(\n
-                options?: {\n
-                [propname: string]: any,
-                bindAttr?: () => Array<any>,\n`;
-    } else {
-      value += `export class ${componentName}<T> extends VueComponent{\n
-                constructor(\n
-                options?: {\n
-                [propname: string]: any,
-                bindAttr?: () => Array<any>,\n`;
+    value += `export class ${componentName} extends ViewComponent{
+      constructor(options?: Partial<${componentName}Options>)`;
+
+    // 生成methods
+    if (Object.prototype.toString.call(item.methods) === '[object Array]') {
+      const logics: Array<Logic> = [];
+      item.methods.forEach((method: any) => {
+        if (!method.advanced) {
+          const methodName = `${method.name}`;
+          // 有参数
+          if (Array.isArray(method.params) && method.params.length) {
+            let methodParamStr = '';
+            method.params.forEach((param: any) => {
+              methodParamStr += param.name.includes('?') ? `${param.name}: ` : `${param.name}?: `;
+              const type = toNaslType(param.type);
+              methodParamStr += type;
+              methodParamStr += ',';
+            });
+            value += indent(1);
+            value += `${methodName}: (${methodParamStr}) => any;\n`;
+            logics.push(creatMethodLogic(method));
+          } else {
+            value += indent(1);
+            value += `${methodName}: () => any;\n`;
+            logics.push(creatMethodLogic({ name: methodName, params: [] }));
+          }
+        }
+      });
+      elementsLogic[componentName] = logics;
+    }
+
+    value += `}`
+    value += `class ${componentName}Options extends ViewComponentOptions {\n`
+
+    // 生成属性
+    if (Object.prototype.toString.call(item.attrs) === '[object Array]') {
+      item.attrs.forEach((attr: any) => {
+        const { name } = attr;
+        value += indent(1);
+        value += `${utils.kebab2Camel2(name)}: any;\n`;
+
+
+        // if (attr.name === 'dataSource') {
+        //   value += indent(1);
+        //   value += `'${attr.name}': nasl.collection.List<T> | { total: nasl.core.Integer, list: nasl.collection.List<T> };\n`;
+        // } else if (attr.name === 'sorting') {
+        //   value += indent(1);
+        //   value += `'${attr.name}': {
+        //             field: nasl.core.String
+        //             order: nasl.core.String
+        //         };\n`;
+        // } else if (attr.name === 'value') {
+        //   value += indent(1);
+        //   value += `'${attr.name}': any;\n`;
+        // } else if (attr.type === 'number') {
+        //   value += indent(1);
+        //   value += `'${attr.name}': nasl.core.Long;\n`;
+        // } else if (attr.type === 'Array') {
+        //   value += indent(1);
+        //   value += `'${attr.name}': Array<any>;\n`;
+        // }
+      });
+
+      value += indent(1);
+      value += `[prop: string]: any;\n`;
     }
 
     // 生成slot
@@ -155,124 +172,73 @@ export default function formatUiTs(allComponent: any) {
           if (slot.supportGenericComponents && slot.supportGenericComponents.length) {
             let str = '';
             slot.supportGenericComponents.forEach((componentName: any) => {
-              const name = toHump(componentName);
+              const name = utils.kebab2Pascal(componentName);
               str += `Array<${name}<T>> | `;
             });
             // 没有插槽的
-            value += `slotDefault?: () => ${str} Array<any>,\n`;
+            value += `slotDefault?: () => ${str} Array<any>;\n`;
           } else if (slot.slotProps) {
             const typeAnnotation = new TypeAnnotation(slot.slotProps.typeAnnotation);
-            value += `slotDefault?: (current: ${typeAnnotation.typeKey}) => Array<any>,\n`;
-          } else if (item.attrs && item.attrs.find((item: any) => item.name === 'data-source')) {
+            value += `slotDefault?: (current: ${typeAnnotation.typeKey}) => Array<any>;\n`;
+          } else if (item.attrs && item.attrs.find((item: any) => item.name === 'dataSource')) {
             // 没有插槽的
-            value += `slotDefault?: (current: nasl.ui.Current<T>)=> Array<any>,\n`;
+            value += `slotDefault?: (current: nasl.ui.Current<T>)=> Array<any>;\n`;
           } else {
             // 没有插槽的
-            value += `slotDefault?: ()=> Array<any>,\n`;
+            value += `slotDefault?: ()=> Array<any>;\n`;
           }
         } else if (!slot.advanced) {
           if (slot.slotProps) {
-            if (item.name === 'u-table-view-column-dynamic' && slotName === 'slotTitle') {
-              value += `${slotName}?: (current: {columnIndex: number, columnItem: T1}) => Array<any>,\n`;
-            } else {
               const typeAnnotation = new TypeAnnotation(slot.slotProps.typeAnnotation);
-              value += `${slotName}?: (current: ${typeAnnotation.typeKey}) => Array<any>,\n`;
-            }
+              value += `${slotName}?: (current: ${typeAnnotation.typeKey}) => Array<any>;\n`;
           } else {
-            value += `${slotName}?: ()=> Array<any>,\n`;
+            value += `${slotName}?: () => Array<any>;\n`;
           }
-          // if (Array.isArray(slot.props) && slot.props.length === 5) {
-          //     value += indent(3);
-          //     value += slotName + `?: (current: nasl.ui.Current<T>) => Array<any>,\n`;
-          // } else if (Array.isArray(slot.props)) {
-          //     value += indent(3);
-          //     value += slotName + `?: (current: {`;
-          //     slot.props.forEach((prop: any) => {
-          //         const type = prop.type || '';
-          //         value += `${prop.name}: ${type}, `;
-          //     });
-          //     value += `}) => Array<any>,\n`;
-          // } else {
-          //     value += indent(3);
-          //     // 这里应该是有类型区分的，但是目前 current 只有一个 类型就先都是这个
-          //     value += slotName + `?: (current: nasl.ui.Current<T>) => Array<any>,\n`;
-          // }
         }
       });
     } else {
       // 没有插槽的
-      value += `slotDefault?: ()=> Array<any>,\n`;
+      value += `slotDefault?: () => Array<any>;\n`;
     }
-
-    value += `${indent(1)}\n}){super()}\n`;
-    // 生成属性
-    if (Object.prototype.toString.call(item.attrs) === '[object Array]') {
-        item.attrs.forEach((attr: any) => {
-            if (attr.name === 'data-source') {
-                value += indent(1);
-                value += `'${attr.name}': Array<T>;\n`;
-            } else if (attr.name === 'sorting') {
-                value += indent(1);
-                value += `'${attr.name}': {
-                    field: nasl.core.String
-                    order: nasl.core.String
-                };\n`;
-            } else if (attr.name === 'value') {
-                value += indent(1);
-                value += `'${attr.name}': any;\n`;
-            } else {
-                if (attr.type === 'number') {
-                    value += indent(1);
-                    value += `'${attr.name}': nasl.core.Long;\n`;
-                } else if (attr.type === 'Array') {
-                    value += indent(1);
-                    value += `'${attr.name}': Array<any>;\n`;
-                }
-            }
-        });
-        if (['u-select', 'van-pickerson'].includes(item.name)) {
-            value += indent(1);
-            value += `'page-number': nasl.core.Long;\n`;
-            value += indent(1);
-            value += `'filterText': nasl.core.String;\n`;
-        }
-    }
-    // 生成methods
-    if (Object.prototype.toString.call(item.methods) === '[object Array]') {
-      //   beforeNavigate?:($event: {to: string | Location, replace: boolean, append: boolean, preventDefault: Function}) => void
-      const logics: Array<Logic> = [];
-      item.methods.forEach((method: any) => {
-        if (!method.advanced) {
-          const methodName = toHump(method.name);
-          if (Array.isArray(method.params) && method.params.length) {
-            let methodParamStr = '';
-            method.params.forEach((param: any) => {
-              methodParamStr += param.name.includes('?') ? `${param.name}: ` : `${param.name}?: `;
-              const type = toNaslType(param.type);
-              methodParamStr += type;
-              methodParamStr += ',';
-            });
-            value += indent(1);
-            value += `${methodName}: (${methodParamStr}) => any;\n`;
-            logics.push(creatMethodLogic(method));
-          } else {
-            value += indent(1);
-            value += `${methodName}: () => any;\n`;
-            logics.push(creatMethodLogic({ name: methodName, params: [] }));
-          }
-        }
-      });
-      elementsLogic[componentName] = logics;
-    }
-    value += '}\n';
+    value += `};\n`;
   }
   value += '}\n';
-  // console.log('组件ts', value);
-  // console.log(elementsLogic);
-  // const elementsEventsMap = getAllComponentEventMap(allComponent);
+
   return {
     code: value,
     elementsLogic,
     elementsEventsMap,
   };
 }
+
+export function createEleLogins(components: Record<string, any>) {
+  const map: Record<string, any> = {}
+
+  // eslint-disable-next-line no-restricted-syntax, guard-for-in
+  for (const i in components) {
+    const componentName = utils.kebab2Pascal(i);
+    if (Object.prototype.hasOwnProperty.call(components, i)) {
+      const item = components[i];
+      const logics: Array<Logic> = [];
+      if (item.methods?.length) {
+        item.methods.forEach((method: any) => {
+          const { name, params } = method;
+
+          logics.push(new Logic({
+            name,
+            params: params?.map((param: any) => {
+              return new Param({
+                name: param.name,
+                typeAnnotation: param.typeAnnotation,
+              });
+            }) || [],
+          }))
+        })
+      }
+
+      map[componentName] = logics;
+    }
+  }
+
+  return map;
+}

package/src/server/getLogics.ts

@@ -20,6 +20,7 @@ import {
 } from '..';
 import { process2LogicNamespace } from './process2LogicNamespace';
 import { moduleToLogicNamesapce } from './getExtensionModules';
+import * as utils from '../utils';
 
 type FakeNode = Partial<Namespace> & {
   children?: Array<FakeNode>;
@@ -132,7 +133,7 @@ function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeN
         return logic.isPublic;
       });
     } else {
-      const itemTag = toHump(item.tag);
+      const itemTag = utils.kebab2Pascal(item.tag);
       const naslServer = (app as any).naslServer;
       const elementsLogic = naslServer.elementsLogic;
       const elementsLogicName = itemTag;

package/src/server/getMemberIdentifier.ts

@@ -15,6 +15,7 @@ import {
   types,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
+  ComponentCompletionPropertyMap,
 } from '..';
 import { formatVariableData, formatFrontEndVariables, formatConfigProperties, formatBackendVariables } from './formatTsUtils';
 
@@ -200,12 +201,12 @@ function getCurrentLogic(
     icon: string;
   }[]
 ) {
-  // 只有data-source check-file可以
+  // 只有dataSource checkFile可以
   if (
-    (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file' || node.name === 'can-dragable-handler' || node.name === 'can-dropin-handler')) ||
+    (node instanceof BindAttribute && (node.name === 'dataSource' || node.name === 'checkFile' || node.name === 'canDragableHandler' || node.name === 'canDropinHandler')) ||
     (node instanceof Identifier &&
       node.parentNode instanceof BindAttribute &&
-      (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file' || node.parentNode.name === 'can-dragable-handler' || node.parentNode.name === 'can-dropin-handler'))
+      (node.parentNode.name === 'dataSource' || node.parentNode.name === 'checkFile' || node.parentNode.name === 'canDragableHandler' || node.parentNode.name === 'canDropinHandler'))
   ) {
     const view = node.view || node.getAncestor('BusinessComponent') as BusinessComponent;
     const viewLogics = view.logics;
@@ -328,6 +329,26 @@ export async function getVariableIdentifier(node: types.SyntaxNode): Promise<Com
       return true;
     });
   }
+
+
+  /**
+   * 过滤stringLiteral
+   * 场景是，属性动态绑定时，会自动补全union类型的枚举值
+   */
+  nextCompletion = nextCompletion?.filter((item: any) => {
+    const { completionDetail } = item;
+    const { displayParts = [] } = completionDetail || {}
+    if ((displayParts || []).length) {
+      const type = displayParts[displayParts.length - 1]
+      if (type?.kind === 'stringLiteral') {
+        return false
+      }
+    }
+
+    return true;
+  })
+
+
   completionData = formatVariableData(nextCompletion, node);
 
   return completionData;
@@ -389,7 +410,55 @@ export function getConfigsIdentifier(node: BaseNode): CompletionProperty[] {
 }
 function flatElements(elements: ViewElement[], componentList: CompletionProperty[], nodeParentElement: string, currentAttriBute: string) {
   elements?.forEach((item) => {
-    if (PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
+    // 根据ComponentCompletionPropertyMap添加
+    if (ComponentCompletionPropertyMap?.[item.tag]) {
+      // 是否当前组件
+      const isCurrent = item.name === nodeParentElement;
+      const stashItem: any = {
+        name: `${item.name}${isCurrent ? '(当前组件)' : ''}`,
+        value: item.name,
+        expression: new Identifier({
+          name: isCurrent ? '当前组件' : `${item.name}`,
+          namespace: `elements.${isCurrent ? '$ce' : item.name}.property`
+        }),
+        children: [],
+      }
+
+      for (const key in ComponentCompletionPropertyMap[item.tag]) {
+        if (Object.prototype.hasOwnProperty.call(ComponentCompletionPropertyMap[item.tag], key)) {
+          const property = ComponentCompletionPropertyMap[item.tag][key];
+
+          // 如果是当前组件，过滤掉当前属性
+          if (!isCurrent || currentAttriBute !== property.prop) {
+            const completionProperty = new CompletionProperty({
+              name: key,
+              value: `${item.name}.${key}`,
+              expression: new MemberExpression({
+                object: stashItem.expression,
+                property: new Identifier({
+                  name: key,
+                  namespace: key,
+                }),
+              })
+            })
+
+            completionProperty.name = `${key}（${property.label}）`;
+            completionProperty.icon = property.icon || 'attr'
+            stashItem.children.push(completionProperty)
+          }
+        }
+      }
+
+      const completionProperty = new CompletionProperty(stashItem);
+      completionProperty.icon = 'element';
+      if (isCurrent) {
+        componentList.unshift(completionProperty)
+      } else {
+        componentList.push(completionProperty)
+      }
+    }
+
+    if (false) {
       const current = item.name === nodeParentElement
       const stashItem: any = {
         name: `${item.name}${current ? '(当前组件)' : ''}`,
@@ -482,7 +551,7 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
         filterTextCompletionProperty.name = 'filterText（过滤文本）';
         filterTextCompletionProperty.icon = 'attr'
         stashItem.children.push(filterTextCompletionProperty)
-      } else if (['u-list-view', 'u-grid-view', 'u-table-view', 'van-list-view', 'van-grid-view'].includes(item.tag)) {
+      } else if (['u-list-view', 'u-grid-view', 'u-table-view', 'van-grid-view'].includes(item.tag)) {
         const sortAttr: any = {
           name: 'sort',
           value: `${item.name}.sort`,
@@ -522,6 +591,7 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
         componentList.push(completionProperty)
       }
     }
+
     if (item.children.length > 0) {
       flatElements(item.children, componentList, nodeParentElement, currentAttriBute)
     }

package/src/server/naslServer.ts

@@ -96,7 +96,7 @@ import {
 import * as utils from '../utils';
 import * as jsoner from '../service/storage/jsoner';
 
-import formatUiTs from './createUiTs';
+import formatUiTs, { createEleLogins } from './createUiTs';
 import axios from '../service/storage';
 
 import { lsp2tspNumber, SourceMap, SourceMapItem, isSameRange } from '../translator';
@@ -222,6 +222,8 @@ const timeZoneArgumentIndexMap = new Map<string, number>([
   ['GetSpecificDaysOfWeek', 3]
 ])
 
+const allComponent: any = {}
+
 @sentryMonitorNaslServer
 class NaslServer {
   /** naslStdlib文件缓存 */
@@ -368,20 +370,47 @@ class NaslServer {
     this.worker.terminate();
   }
 
-  async createUiTs(allComponent: any) {
+  async createUiTs(components: any, optinos: { tsCode: string, baseComponnets: Record<string, any> }) {
+    const { tsCode, baseComponnets } = optinos;
+    // console.log('baseComponnets', baseComponnets);
+
+    Object.assign(allComponent, components)
     const { code, elementsLogic } = await formatUiTs(allComponent);
-    // 放入生產的uits文件
+
     await this.addFile(
       {
         file: 'nasl.ui.definition.ts',
+        // eslint-disable-next-line import/no-webpack-loader-syntax, global-require, import/extensions
+        fileContent: require('!!raw-loader!../../sandbox/stdlib/nasl.ui.definition.ts').default,
+      },
+      { cache: true }
+    )
+
+    // 放入生產的uits文件
+    await this.addFile(
+      {
+        file: 'nasl.ui.extra.ts',
         fileContent: code,
       },
       { cache: true }
     );
+
+    // 添加基础组件的方法到elementsLogic
+    Object.assign(elementsLogic, createEleLogins(baseComponnets));
+
+    // 基础组件
+    await this.addFile(
+      {
+        file: 'nasl.ui.component.ts',
+        fileContent: tsCode,
+      },
+      { cache: true }
+    )
+
     Object.keys(naslStdlibMap).forEach(async (libFileName: string) => {
       await this.addFile(
         {
-          file: `/${  libFileName}`,
+          file: `/${libFileName}`,
           fileContent: naslStdlibMap[libFileName],
         },
         { cache: true }
@@ -633,7 +662,7 @@ class NaslServer {
     }
     /// #if process.env.NODE_ENV === 'development'
     // 首次尝试请求
-    await axios.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+    await axios.post(`/api/App/debugEmbedded?id=${  app.id}`, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
     if (this.openDebugEmbedded && globalThis.window) {
       // For TS build
       try {
@@ -778,6 +807,9 @@ class NaslServer {
       const flag = displayString.includes('<') && displayString.includes('>');
       const types = /<([^()]+)>/g.exec(displayString);
       let typeStr = types && types[1];
+      // 从 {entity1:Entity1(defaultDS);},unknown,unknown,unknown 取出{entity1:Entity1(defaultDS);}
+      typeStr = typeStr?.split(',')[0];
+
       if (flag) {
         // 自定义结构的展示
         if (typeStr.includes('__name: "AStructure_')) {
@@ -1738,7 +1770,7 @@ class NaslServer {
             const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
                 const diagnostic = {
-                  node: node,
+                  node,
                   severity: 'error',
                   message: `变量 ${node.name} 类型定义包含相同的数据类型`,
                 };
@@ -2176,7 +2208,7 @@ class NaslServer {
             const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
               const diagnostic = {
-                node: node,
+                node,
                 severity: 'error',
                 message: `${nodeTypeName} ${node.name} 类型定义包含相同的数据类型`,
               };
@@ -2192,7 +2224,7 @@ class NaslServer {
             const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
               const diagnostic = {
-                node: node,
+                node,
                 severity: 'error',
                 message: `输入参数 ${node.name} 类型定义包含相同的数据类型`,
               };
@@ -2268,7 +2300,7 @@ class NaslServer {
             if (new Decimal(maxVal).lessThan(minVal)) {
               const errorMsg = '最小值不得大于最大值';
               const diag: any = {
-                node: node,
+                node,
                 severity: 'warning',
                 message: errorMsg,
               };
@@ -2330,6 +2362,7 @@ class NaslServer {
 
     return flag
   }
+
   checkNodeError(node: BaseNode, diagnostics: Diagnostic[]): any {
     if (!node) return;
     // 如果节点是match的看看节点里是不是有重复的
@@ -2739,11 +2772,9 @@ class NaslServer {
               // 找到的内容的开始位置， 要大于申明内容开始的位置，要不就不包含在内了
               if (diagnostic.start.offset - item.start.character <= diagnostic.start.offset - minRange.item.start.character) {
                 minRange = { node, item };
-              } else {
-                if (diagnostic.start.offset < lsp2tspNumber(minRange.item.start.character)) {
+              } else if (diagnostic.start.offset < lsp2tspNumber(minRange.item.start.character)) {
                   minRange = { node, item };
                 }
-              }
             } else if (item.end.line - item.start.line <= minRange.item.end.line - minRange.item.start.line) {
               // 行都一致 ，比较列
               if (minRange.item.start.line === item.start.line && minRange.item.end.line === item.end.line) {
@@ -4164,7 +4195,7 @@ class NaslServer {
           const lastLen = codeArr?.[codeArr.length - 1]?.length;
           // MemberExpression取最后一位当做类型
           const indexOf = code.length - lastLen;
-          fileDetail.offset = fileDetail.offset + indexOf;
+          fileDetail.offset += indexOf;
         }
       } else if (node.concept === 'Match') {
         const code = getCode(item);
@@ -4881,12 +4912,12 @@ class NaslServer {
     if (Object.keys(object || {}).length === 1 && Object.keys(oldObject).length === 1) {
       if (object.i18nKey && !oldObject.i18nKey) {
         return;
-      } else if (object.i18nInfo && !oldObject.i18nInfo) {
+      } if (object.i18nInfo && !oldObject.i18nInfo) {
         return;
-      } else if (!object.i18nKey && oldObject.i18nKey) {
+      } if (!object.i18nKey && oldObject.i18nKey) {
         // 撤销重做 也跳过更新
         return;
-      } else if (!object.i18nInfo && oldObject.i18nInfo) {
+      } if (!object.i18nInfo && oldObject.i18nInfo) {
         // 撤销重做 也跳过更新
         return;
       }