@lcap/nasl 4.4.2-rc.4 → 4.4.3-rc.1

package/out/server/naslServer.js

@@ -52,6 +52,7 @@ const service_1 = require("@lcap/nasl-concepts/service");
 const utils = __importStar(require("../utils"));
 const memory_optimization_1 = require("../generator/release-body/memory-optimization");
 const createUiTs_1 = __importStar(require("./createUiTs"));
+const naslUiComponentTs_1 = require("./naslUiComponentTs");
 const translator_1 = require("../translator");
 const translator_2 = require("./translator");
 const common_1 = require("../common");
@@ -476,6 +477,8 @@ class NaslServer {
         this.typerErrRecords = [];
         // 确保首屏检查没有"传统艺能"、"时序问题"
         this.cachedEventPayloadValues = [];
+        // 标记正在等待组件定义加载，防止重复触发
+        this.waitingForComponentDefs = false;
         // 当前重命名模式：rename-only: 只重命名，update: 更新引用
         this.currentRenameMode = null;
         this.oqlDisaster = false;
@@ -906,7 +909,8 @@ class NaslServer {
         // without ui ts data, renaming will be wrong, theoretically
         if (this.isFirstScreen
             || !this.createUiTsArg1Copy?.basicUITsCode
-            || (options?.basicUITsCode && this.createUiTsArg1Copy?.basicUITsCode != options?.basicUITsCode)) {
+            || (options?.basicUITsCode && this.createUiTsArg1Copy?.basicUITsCode != options?.basicUITsCode)
+            || this.createUiTsArg1Copy?.naslUiComponentTsOverride !== options?.naslUiComponentTsOverride) {
             this.createUiTsArg0Copy = components;
             this.createUiTsArg1Copy = options;
         }
@@ -918,16 +922,20 @@ class NaslServer {
         const convertTsCode = (code) => {
             code = code || '';
             code = code.replace(/nasl.core.Integer/g, 'nasl.core.Long');
-            // 匹配union类型的正则
-            const unionReg = /\s*['"].*['"](\s*\|\s*['"].*['"])+/g;
-            code = code.replace(unionReg, 'nasl.core.String');
             return code;
         };
         // 添加基础组件的方法到elementsLogic
         Object.assign(elementsLogic, (0, createUiTs_1.createEleLogins)(standardUIComponents));
+        const naslUiTsQuery = (0, naslUiComponentTs_1.getNaslUiComponentTsQueryOpts)();
+        const naslUiComponentTsOverrideMerged = options.naslUiComponentTsOverride !== undefined
+            ? options.naslUiComponentTsOverride
+            : naslUiTsQuery.overrideFragment;
         const naslUiComponentTsFile = {
             file: 'nasl.ui.component.ts',
-            fileContent: convertTsCode(options.basicUITsCode),
+            fileContent: (0, naslUiComponentTs_1.buildNaslUiComponentTsFileContent)(convertTsCode, {
+                basicUITsCode: options.basicUITsCode,
+                naslUiComponentTsOverride: naslUiComponentTsOverrideMerged,
+            }),
         };
         const extensionComponentFile = {
             file: 'extension.component.ts',
@@ -3825,6 +3833,18 @@ class NaslServer {
             const { changed, updatedNodes } = this.processAllEvents(events);
             if (changed) {
                 this.logger.info('triggerTypeChecking 需要进行类型检查');
+                // 检测是否有新引入的 extension 依赖库（需要加载其声明文件）
+                const newExtensionDeps = this.detectNewExtensionDependencies();
+                if (newExtensionDeps.length > 0) {
+                    this.logger.info(`[flushChangesForTypeChecking] 检测到 ${newExtensionDeps.length} 个新 extension 依赖，等待 IDE 层加载声明: ${newExtensionDeps.join(', ')}`);
+                    const loaded = await this.waitForExtensionDepsReload(newExtensionDeps);
+                    if (loaded) {
+                        this.logger.info('[flushChangesForTypeChecking] 依赖声明加载完成，继续类型检查');
+                    }
+                    else {
+                        this.logger.warn('[flushChangesForTypeChecking] 依赖声明加载失败或超时，可能产生误报');
+                    }
+                }
                 const oqlCheckFiles = new Set((0, nasl_language_server_core_1.getOqlFiles)(this.semEnv, this.typerCheckFiles, this.typerRemoveNodes));
                 const originLogicCheckFiles = new Set((0, nasl_language_server_core_1.getOriginLogicFiles)(this.semEnv, this.typerCheckFiles, this.typerRemoveNodes));
                 const exportInterfacesCheckFiles = new Set((0, nasl_language_server_core_1.getExportInterfacesFiles)(this.semEnv, this.typerCheckFiles, this.typerRemoveNodes));
@@ -3930,6 +3950,80 @@ class NaslServer {
             }),
         });
     }
+    /**
+     * 检测本次增量变更中是否存在新引入的 extension 类型依赖库
+     * 当 operationRecord.forward() 等操作引入新依赖时，需要加载其声明文件
+     *
+     * 注意：
+     * - 只检测 'create' 操作（typerCreateNodes），因为新依赖总是先被创建
+     * - 如果是依赖版本升级（update），声明已在初始化时加载，无需处理
+     * - 仅处理 type === 'extension' 且有 frontends 的依赖（前端组件库）
+     *
+     * @returns 新引入的 extension 依赖名称列表
+     */
+    detectNewExtensionDependencies() {
+        if (!this.semEnv) {
+            return [];
+        }
+        const newExtensionDeps = new Set();
+        // 扫描本次创建的节点中的 Module（依赖库）
+        // operationRecord.forward() 的 redo 操作会将依赖作为 'create' 放入 typerCreateNodes
+        for (const node of this.typerCreateNodes) {
+            if (node.concept !== 'Module') {
+                continue;
+            }
+            const module = node;
+            // 只处理 extension 类型的依赖（有前端组件的依赖库）
+            if (module.type !== 'extension') {
+                continue;
+            }
+            // 检查该依赖是否有 frontends（包含 viewComponents）
+            const hasFrontends = module.frontends && module.frontends.length > 0;
+            if (!hasFrontends) {
+                continue;
+            }
+            const depName = module.name;
+            if (depName) {
+                newExtensionDeps.add(depName);
+                this.logger.info(`[detectNewExtensionDependencies] 检测到新引入的 extension 依赖: ${depName}`);
+            }
+        }
+        return Array.from(newExtensionDeps);
+    }
+    /**
+     * 等待 IDE 层完成 extension 依赖声明加载
+     * 通过 Promise 和事件机制实现异步等待
+     */
+    async waitForExtensionDepsReload(depNames) {
+        if (this.waitingForComponentDefs) {
+            // 已经在等待中，避免重复触发
+            return false;
+        }
+        if (depNames.length === 0) {
+            return true;
+        }
+        this.waitingForComponentDefs = true;
+        return new Promise((resolve) => {
+            // 设置超时，避免无限等待（10秒，依赖加载可能需要更长时间）
+            const timeout = setTimeout(() => {
+                this.waitingForComponentDefs = false;
+                this.logger.warn(`[waitForExtensionDepsReload] 等待依赖声明加载超时: ${depNames.join(', ')}`);
+                resolve(false);
+            }, 10000);
+            // 监听一次性事件：IDE 层完成声明加载后会触发此事件
+            const handler = () => {
+                clearTimeout(timeout);
+                this.embeddedTSEmitter?.off('extensionDeps:loaded', handler);
+                this.waitingForComponentDefs = false;
+                this.logger.info('[waitForExtensionDepsReload] 依赖声明加载完成');
+                resolve(true);
+            };
+            this.embeddedTSEmitter?.once('extensionDeps:loaded', handler);
+            // 发送缺失事件通知 IDE 层
+            this.logger.info(`[waitForExtensionDepsReload] 通知 IDE 层加载依赖声明: ${depNames.join(', ')}`);
+            this.embeddedTSEmitter?.emit('extensionDeps:missing', { extra: { deps: depNames } });
+        });
+    }
     static toRaw(nd) {
         // @ts-ignore
         return nd?.__v_raw ?? nd;
@@ -4016,6 +4110,7 @@ class NaslServer {
         this.semEnv.app = rawApp;
         const isAIStrictMode = this.flags.isStrictMode;
         this.semEnv.isAIStrictMode = isAIStrictMode;
+        this.semEnv.looseTypeCheck = String(rawApp.preferenceMap?.looseTypeCheck) === 'true' ? true : undefined;
         this.semEnv.refMgr.buildQNameDefsForApp(rawApp);
         this.semEnv.errorDiagnoser = nasl_language_server_core_1.checker.createErrorDiagnoser({
             app: rawApp,