@lcap/nasl 2.22.1 → 2.22.2-beta.2

package/out/server/naslServer.js

@@ -145,6 +145,8 @@ class NaslServer {
                     const records = await this._resolveDiagnosticRecords(data.records);
                     this.diagnosticManager.pushAll(records);
                     try {
+                        // 结束诊断和标注
+                        (0, common_1.invokeCommand)('naslServer:endWork');
                         (0, common_1.invokeCommand)('naslServer:nodeChange');
                     }
                     catch (e) {
@@ -774,6 +776,11 @@ class NaslServer {
         return diagnosticRecords;
     }
     async getDiagnosticRecordsAndPushAll(fileNames) {
+        // 开始诊断和标注
+        try {
+            (0, common_1.invokeCommand)('naslServer:startWork');
+        }
+        catch (err) { }
         const records = await this.getDiagnosticRecords(fileNames);
         // diagnosticManager.pushAll(records);
     }
@@ -2303,6 +2310,52 @@ class NaslServer {
         if (node instanceof concepts_1.Entity) {
             // 过滤一把不需要改的信息
             refsList = refsList.filter((item) => fileNode.getEmbeddedFilePath() !== item.file || item.isDefinition === true);
+            // 防止死循环
+            // const forRefsList = [...refsList];
+            // for (let i = 0; i < forRefsList.length; i++) {
+            //     const refItem = forRefsList[i];
+            //     if (refItem.lineText?.includes('new nasl.langUtil.Collection')) {
+            //         try {
+            //             const fileNode = this.file2NodeMap.get(refItem.file);
+            //             if (!fileNode)
+            //                 return;
+            //             const minRange = this._findMinRange(refItem, fileNode as FileNode);
+            //             if (minRange.node && (minRange.node instanceof QueryFromExpression || minRange.node instanceof QueryJoinExpression)) {
+            //                 const callQueryComponent = minRange.node.getAncestor('CallQueryComponent') as CallQueryComponent;
+            //                 const callQueryComponentTypeAnnotation = callQueryComponent.typeAnnotation;
+            //                 const { currentSource: qcTypeAnnotationCurrentSource, fileNode } = callQueryComponentTypeAnnotation.getCurrentSource();
+            //                 const { currentSource: logicCurrentSource } = fileNode.getCurrentSource();
+            //                 const aggregateLength = callQueryComponent.select.selectAggregateElements.filter((item: any) => item.aggregateName && item.asName).length;
+            //                 const groupByLength = callQueryComponent.groupBy.filter((item) => (item.groupElement as QueryFieldExpression)?.propertyName && (item.groupElement as QueryFieldExpression).asName).length;
+            //                 if (!groupByLength && !aggregateLength && callQueryComponentTypeAnnotation.typeKind === 'anonymousStructure') {
+            //                 // 拿到 List 的泛型（匿名数据结构）的所有属性
+            //                     const properties = callQueryComponentTypeAnnotation.properties[0].typeAnnotation.typeArguments[0].properties;
+            //                     const targetProperty = properties.find((p) => p.name === utils.firstLowerCase(node.name));
+            //                     if (!targetProperty) {
+            //                         continue;
+            //                     }
+            //                     const { currentSource: propertyTypeCurrentSource } = targetProperty.typeAnnotation.getCurrentSource();
+            //                     // 减去 ": " 2个字符、减去属性名长度
+            //                     const propertyCharacter = propertyTypeCurrentSource.range.start.character - 2 - targetProperty.name.length;
+            //                     const propertyOffset = propertyCharacter - qcTypeAnnotationCurrentSource.range.start.character;
+            //                     const qcTypeAnnotationOffset = logicCurrentSource.code.indexOf(qcTypeAnnotationCurrentSource.code);
+            //                     const declarationCodeArr = logicCurrentSource.code.slice(0, qcTypeAnnotationOffset).split('\n');
+            //                     const line = declarationCodeArr.length - 1;
+            //                     const character = declarationCodeArr[declarationCodeArr.length - 1].length;
+            //                     // eslint-disable-next-line no-await-in-loop
+            //                     const newRefs = await this.references({
+            //                         file: (fileNode as any).getEmbeddedFilePath(),
+            //                         line: line + 2,
+            //                         offset: character + 1 + propertyOffset,
+            //                     });
+            //                     refsList.push(...newRefs.refs);
+            //                 }
+            //             }
+            //         } catch (e) {
+            //             console.error('naslServer实体引用', e);
+            //         }
+            //     }
+            // }
             // 不再当前文件里
             // 或者在当前列表但是位置小于entity的结束位置
         }
@@ -2666,6 +2719,8 @@ class NaslServer {
                         const newTextValue = node.parentNode.name === 'defaultDS' ? `/api/${newName}/import` : `/api/${node.parentNode.name}/${newName}/import`;
                         minRange.setTypeMethods = 'setUrlValue';
                         minRange.newValue = newTextValue;
+                        // } else if (minRange.node instanceof Identifier) {
+                        //     minRange.newValue = utils.firstLowerCase(newValue);
                     }
                 }
                 // 如果是修改实体属性，要同步实体属性