@lcap/nasl 3.8.2-beta.8 → 3.8.3-beta.1

package/out/server/naslServer.js

@@ -435,7 +435,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         app.naslServer = this;
         const self = this;
         this.performance = performance;
-        const results = await utils.timeSlicingWithGenerator(getAllTsFiles());
+        const results = await utils.runGeneratorAsync(getAllTsFiles());
         const files = results.map((result) => ({
             file: result.filePath,
             fileContent: result.code,
@@ -2996,7 +2996,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
             refsList = [...newRefs.refs];
         }
         else if (node instanceof concepts_1.Module && !(node instanceof concepts_1.Connector)) {
-            const lists = node.logics || node.structures || node.enums;
+            // 数组有长度的情况下，才去查找
+            const { logics, structures, enums, interfaces } = node;
+            const lists = (logics?.length && logics) ||
+                (structures?.length && structures) ||
+                (enums?.length && enums) ||
+                (interfaces?.length && interfaces);
+            // const lists = node.logics || node.structures || node.enums;
             const moduleName = fileNode.getEmbeddedFilePath();
             if (lists.length) {
                 const item = lists[0];
@@ -4553,36 +4559,50 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return utils.runGeneratorAsync(this._getQuickInfoNodesTypeMapWithGenerator(nodes));
     }
     // 全量标注并且返回json
-    async getNaslAnnotatedJSON(app, releaseFlag) {
+    async getNaslAnnotatedJSON(naslNode, releaseFlag) {
+        // eslint-disable-next-line @typescript-eslint/no-shadow
+        const isApp = concepts_1.asserts.isApp(naslNode);
         if (this.changeStackList?.length) {
             throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
         }
-        this.logger.time('全量标注');
+        this.logger.time(`${isApp ? '全量' : '单文件'}标注`);
         const nodes = [];
-        this.file2NodeMap.forEach((fileNode, filePath) => {
-            // 先不排除view，传递给后端的时候，去除views下的标注
-            if (!['DataSource', 'Enum', 'Role'].includes(fileNode.concept)) {
-                fileNode.sourceMap.forEach((item, node) => {
-                    nodes.push({
-                        filePath,
-                        node,
-                        item,
-                    });
+        if (!isApp) {
+            const filePath = naslNode?.getEmbeddedFilePath();
+            naslNode.sourceMap.forEach((item, node) => {
+                nodes.push({
+                    filePath,
+                    node,
+                    item,
                 });
-            }
-        });
+            });
+        }
+        else {
+            this.file2NodeMap.forEach((fileNode, filePath) => {
+                // 先不排除view，传递给后端的时候，去除views下的标注
+                if (!['DataSource', 'Enum', 'Role'].includes(fileNode.concept)) {
+                    fileNode.sourceMap.forEach((item, node) => {
+                        nodes.push({
+                            filePath,
+                            node,
+                            item,
+                        });
+                    });
+                }
+            });
+        }
         const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
         console.time('app toJSON');
         const jsonMap = new Map();
-        const json = app._toJSON((source, instance) => {
+        const json = naslNode._toJSON((source, instance) => {
             jsonMap.set(instance, source);
             return source;
         });
         console.timeEnd('app toJSON');
-        this.logger.timeEnd('全量标注');
+        this.logger.timeEnd(`${isApp ? '全量' : '单文件'}标注`);
         // 测试环境或者是调试模式打印数据
         if (utils.isDebugMode || utils.isTestBrowser) {
-            this.logger.info('全量标注数据', json);
+            this.logger.info(`${isApp ? '全量' : '单文件'}标注数据`, json);
         }
         if (releaseFlag) {
             console.time('annotationToJson');