@lcap/nasl 3.14.0-rc.4 → 3.14.0-rc.5

package/out/server/naslServer.js

@@ -238,8 +238,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             const tsFilePathsToCheck = new Set();
             for (const fileNode of oqlFiles) {
-                this.semData.isFirstScreen = true; // getter 会看 naslServer.semData.isFirstScreen
-                this.semData.redirectSlowGetters(NaslServer_1.toRaw(this.getProxyApp()));
                 let tsFilePath;
                 try {
                     tsFilePath = fileNode.getEmbeddedFilePath();
@@ -272,9 +270,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 fileNode.sourceMap = tsFile.sourceMap;
                 // 麻了，查了半天是没 set 这里
                 this.file2NodeMap.set(tsFile.filePath, fileNode);
-                this.semData.recoverSlowGetters();
-                this.semData.clearSemanticData();
-                this.semData.isFirstScreen = false;
             }
             if (utils.isDebugMode) {
                 console.info('TS 校验以下文件', Array.from(oqlFiles).map((item) => item.getEmbeddedFilePath()));
@@ -420,8 +415,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         }
                         utils.isDebugMode && console.timeEnd('\x1b[44m\x1b[97m 用户体感首屏检查耗时 \x1b[0m');
                     }
-                    this.semData.recoverSlowGetters();
-                    this.semData.clearSemanticData();
                 }
                 this.notifyPublishDiagnosticsEnd(tsDiagnostics);
                 if (this.firstScreenEndWork) {
@@ -498,16 +491,21 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 });
                 // 如果有长度，那么触发类型检查
                 if (this.changeStackList.length) {
-                    itemEventPtr.forEach(payload => {
-                        // 增量更新 step 1：处理 create、delete、update 的局部符号
-                        const startTime = performance.now();
-                        this.semEnv.refMgr.updateRefsInNaslFragment(this.semEnv, payload);
-                        const endTime = performance.now();
-                        const duration = endTime - startTime;
-                        if (duration > 10) {
-                            console.log(`\x1b[44m\x1b[97m Reference manager: Update Nasl Fragment References took ${duration.toFixed(2)}ms \x1b[0m`);
-                        }
-                    });
+                    try {
+                        itemEventPtr.forEach(payload => {
+                            // 增量更新 step 1：处理 create、delete、update 的局部符号
+                            const startTime = performance.now();
+                            this.semEnv.refMgr.updateRefsInNaslFragment(this.semEnv, payload);
+                            const endTime = performance.now();
+                            const duration = endTime - startTime;
+                            if (duration > 10) {
+                                console.log(`\x1b[44m\x1b[97m Reference manager: Update Nasl Fragment References took ${duration.toFixed(2)}ms \x1b[0m`);
+                            }
+                        });
+                    }
+                    catch (err) {
+                        this.logger.error('error: update references in nasl fragment', err);
+                    }
                     void this.flushChangesForTypeChecking().catch(err => {
                         this.logger.error('triggerTypeChecking error', err);
                     });
@@ -817,9 +815,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.semData = new nasl_concepts_1.SemanticData();
         // 除此之外，好像没什么简单的方法可以让 __xxx.ts 文件快速拿到 app.naslServer 的引用了……
         // @ts-ignore
-        this.semData.redirectSlowGetters(rawApp);
-        // @ts-ignore
         this.semData.collectAllSemanticCtx(rawApp);
+        // @ts-ignore
+        this.semData.redirectSlowGetters(rawApp);
         this.logger.timeEnd('全量生成 TS——翻译——简单语义分析');
         const { notifyEndWork } = this.notifyStartWork();
         this.firstScreenEndWork = () => {
@@ -843,6 +841,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
         await this.waitOqlQueryComponentChildrenFinish(app);
         // 翻译 ts 文件
         const results = await utils.runGeneratorAsync(getAllTsFiles());
+        this.semData.recoverSlowGetters();
+        this.semData.clearSemanticData();
         const files = results.map((result) => ({
             file: result.filePath,
             fileContent: result.code,
@@ -3224,35 +3224,32 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const fileNodeRaw = NaslServer_1.toRaw(fileNode);
         fileNodeRaw !== NaslServer_1.toRaw(fileNode2) && console.log('\x1b[41m\x1b[97m☁️ handleAllChange 事件 fileNode 校验失败\x1b[0m');
         const targetNodeRaw = NaslServer_1.toRaw(targetNode);
-        // 处理定义节点或引用节点，更新typerCheckFiles和typerRemoveNodes
-        let result = null;
+        // 处理定义节点或引用节点，更新 typerCheckFiles 和 typerRemoveNodes
+        let result = false;
         if (nasl_language_server_core_1.ReferenceManager.defConcept.includes(targetNodeRaw.concept)) {
             if (action === 'update') {
                 if (payload?.field === 'name') {
                     const oldName = payload.oldObjNasl?.[0];
-                    result = (0, nasl_language_server_core_1.preProcessDefRename)(this.semEnv, targetNodeRaw, oldName, this.currentRenameMode, this.oqlRemoveNodesTsPath);
+                    result = (0, nasl_language_server_core_1.preProcessDefRename)(this.semEnv, targetNodeRaw, this.typerCheckFiles, oldName, this.currentRenameMode, this.oqlRemoveNodesTsPath);
                     this.currentRenameMode = null;
                 }
                 else {
-                    result = (0, nasl_language_server_core_1.preProcessDefUpdate)(this.semEnv, targetNodeRaw);
+                    result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
                 }
             }
             else if (action === 'create') {
-                result = (0, nasl_language_server_core_1.preProcessDefCreation)(this.semEnv, targetNodeRaw);
+                result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
+                this.typerCreateNodes.add(targetNodeRaw);
             }
             else if (action === 'delete') {
-                result = (0, nasl_language_server_core_1.preProcessDefRemoval)(this.semEnv, targetNodeRaw);
+                result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
+                this.typerRemoveNodes.add(targetNodeRaw);
             }
         }
         else {
-            result = (0, nasl_language_server_core_1.preProcessNonDefAction)(targetNodeRaw);
-        }
-        if (result) {
-            result.typerCheckFiles.forEach(file => this.typerCheckFiles.add(file));
-            result.typerRemoveNodes.forEach(node => this.typerRemoveNodes.add(node));
-            result.typerCreateNodes.forEach(node => this.typerCreateNodes.add(node));
-            return true;
+            result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
         }
+        return result;
     }
     notifyStartWork() {
         this.logger.time('语言服务变更');
@@ -3478,6 +3475,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         // console.timeEnd('\x1b[44m\x1b[97m Build SymbolGraph \x1b[0m');
         const refMgr = new nasl_language_server_core_1.ReferenceManager();
         this.semEnv = new nasl_language_server_core_1.SemEnv(refMgr, utils.isDebugMode);
+        this.semEnv.app = rawApp;
         this.semEnv.refMgr.buildQNameDefsForApp(rawApp);
         this.semEnv.errorDiagnoser = nasl_language_server_core_1.checker.createErrorDiagnoser({
             app: rawApp,