@lcap/nasl 4.3.0-beta.25 → 4.3.0-beta.27

package/out/server/naslServer.js

@@ -394,12 +394,14 @@ declare namespace nasl.oql {
     export function MAX(value: nasl.core.DateTime): nasl.core.DateTime;
     export function MAX(value: nasl.core.Time): nasl.core.Time;
     export function MAX(value: nasl.core.Boolean): nasl.core.Boolean;
+    export function MAX(value: nasl.core.String): nasl.core.String;
     export function MIN(value: nasl.core.Long): nasl.core.Long;
     export function MIN(value: nasl.core.Decimal): nasl.core.Decimal;
     export function MIN(value: nasl.core.Date): nasl.core.Date;
     export function MIN(value: nasl.core.DateTime): nasl.core.DateTime;
     export function MIN(value: nasl.core.Time): nasl.core.Time;
     export function MIN(value: nasl.core.Boolean): nasl.core.Boolean;
+    export function MIN(value: nasl.core.String): nasl.core.String;
 
     // self
     export function STARTWITH(str1: nasl.core.String, str2: nasl.core.String): nasl.core.Boolean;
@@ -499,7 +501,6 @@ class NaslServer {
              */
             tssEnabled: true,
         };
-        this.uiTsInitedResolve = null;
         // 检查共享数据是否有更新
         this._latestVersionsOfSharedApp = [];
         this.firstScreenEndWork = undefined;
@@ -595,7 +596,6 @@ class NaslServer {
         this.getProxyNode = (nd) => {
             return this.getProxyApp()?.findNodeByPath(nd.nodePath);
         };
-        // 初始化 uiTsInited Promise 并保存 resolve 函数
         this.uiTsInited = new Promise((resolve) => {
             this.uiTsInitedResolve = resolve;
         });
@@ -624,24 +624,14 @@ class NaslServer {
         }
     }
     synthesisFlagsFromUrl() {
-        if (utils.isBrowser) {
-            function isOQLCheckEnabled() {
-                if (/[?&]oql-check=false/.test(location.search)) {
-                    return false;
-                }
-                else if (/[?&]oql-check=true/.test(location.search)) {
-                    return true;
-                }
-                else {
-                    // 测试环境默认打开。
-                    return /lcap\.codewave-test\.163yun\.com/.test(location.host);
-                }
-            }
-            return {
-                tssEnabled: !isOQLCheckEnabled(),
-            };
+        if (!utils.isBrowser) {
+            return undefined;
         }
-        return undefined;
+        const urlParams = new URLSearchParams(location.search);
+        const tssEnabled = urlParams.get('oql-check') === 'false';
+        return {
+            tssEnabled,
+        };
     }
     async launch(opt) {
         const flags = opt.flags ?? this.synthesisFlagsFromUrl();
@@ -825,6 +815,8 @@ class NaslServer {
                         action: item.originEvent.action,
                         objNasl: item.originEvent.objNasl,
                         oldObjNasl: item.originEvent.oldObjNasl,
+                        object: item.originEvent.object,
+                        oldObject: item.originEvent.oldObject,
                         field: item.originEvent.field, // 判断是否是 rename
                         target: item.originEvent.target, // rename 专用
                         ctxProcess: item.originEvent.ctxProcess // 流程特殊情况：更新流程关联的 view
@@ -901,9 +893,18 @@ class NaslServer {
         }
     }
     async createUiTs(components, options) {
+        let triggerUiTsLoadFinished = this.uiTsInitedResolve;
+        if (!this.uiTsInited) {
+            this.uiTsInited = new Promise((resolve) => {
+                triggerUiTsLoadFinished = resolve;
+                this.uiTsInitedResolve = triggerUiTsLoadFinished;
+            });
+        }
         // save resources so that it could be reused when importing any templates
         // without ui ts data, renaming will be wrong, theoretically
-        if (this.isFirstScreen) {
+        if (this.isFirstScreen
+            || !this.createUiTsArg1Copy?.basicUITsCode
+            || (options?.basicUITsCode && this.createUiTsArg1Copy?.basicUITsCode != options?.basicUITsCode)) {
             this.createUiTsArg0Copy = components;
             this.createUiTsArg1Copy = options;
         }
@@ -945,8 +946,10 @@ class NaslServer {
             await this.addFile(extensionComponentFile, { cache: true });
         }
         this._debugPutFilesInAnonymousApp([extensionComponentFile]);
-        this.uiTsInitedResolve(() => {
-            (0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, naslUiComponentTsFile.fileContent);
+        triggerUiTsLoadFinished(() => {
+            if (naslUiComponentTsFile.fileContent) {
+                (0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, naslUiComponentTsFile.fileContent);
+            }
             if (extensionComponentFile.fileContent) {
                 (0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, extensionComponentFile.fileContent);
             }