@lcap/nasl 4.1.0-rc.2 → 4.1.0-rc.4

package/out/server/naslServer.js

@@ -60,25 +60,7 @@ const decorators_1 = require("../decorators");
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const nasl_language_server_core_1 = require("@lcap/nasl-language-server-core");
 const findReference_1 = require("./findReference");
-const NEED_SYNC_BIND_ATTRIBUTE = [
-    'textField',
-    'valueField',
-    'iconField',
-    'toField',
-    'parentField',
-    'childrenField',
-    'hasChildrenField',
-    'field',
-    'idField',
-    'titleField',
-    'closableField',
-    'descriptionField',
-    'expandedField',
-    'disabledField',
-    'nameField',
-    'labelField',
-    'sortField'
-];
+const nasl_server_client_1 = require("./client/nasl-server-client");
 const SentryMessager = (0, nasl_sentry_1.sentryMonitorTSWorkerMessager)(Messager_1.default);
 // naslStdlib文件缓存；作为全局变量给多实例用复用
 const __naslStdlibFileCacheMap = new Map();
@@ -406,7 +388,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         rawApp.emit('collect:end');
                         this.semData.isFirstScreen = false;
                         this.semEnv.allocatedVEQNames.forEach(n => {
-                            this.semEnv.refMgr.qNameDefs.delete(n);
+                            this.semEnv.refMgr.gQNameDefs.delete(n);
                         });
                         this.semEnv.allocatedVEQNames.length = 0;
                         for (const value of this.cachedEventPayloadValues) {
@@ -1651,11 +1633,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const { parentNode } = nd;
         const semEnv = NaslServer_1.toRaw(this.semEnv);
         let result = wrapRefs(semEnv.refMgr.getReferences(semEnv, nd));
-        if (nd.concept === 'ViewElement') {
-            const refMemAddrs = semEnv.refMgr.getViewElementRefs(semEnv, nd);
-            result.push(...wrapRefs(refMemAddrs));
-        }
-        else if (nd.concept === 'ProcessElementV2') {
+        if (nd.concept === 'ProcessElementV2') {
             const refMemAddrs = semEnv.refMgr.getProcessElementRefs(semEnv, nd);
             result.push(...wrapRefs(refMemAddrs));
         }
@@ -1668,7 +1646,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }
             }
         }
-        else if (concepts_1.asserts.isStrictParam(nd)) {
+        else if (nd.concept === 'BindEvent') {
+            // v4.1 新增 绑定事件 改类型，需要把 事件逻辑的引用，全部迁移过去
+            // v4.1 修改：logics 其实只能有一个
+            if (nd.logics[0].concept === 'Logic') {
+                const eventLogicRefs = semEnv.refMgr.getReferences(semEnv, nd.logics[0]);
+                result.push(...wrapRefs(eventLogicRefs));
+            }
+        }
+        else if (nd.concept === 'Param' || nd.concept === 'ParamWithGroup') {
             // 调用处的 keyword = XXX 等也要修改，所以查 Logic、View 等的引用
             const pNode = NaslServer_1.toRaw(parentNode);
             if ((0, nasl_language_server_core_1.isCallableNaslLogic)(pNode) || concepts_1.asserts.isStrictView(pNode)) {
@@ -1715,6 +1701,22 @@ let NaslServer = NaslServer_1 = class NaslServer {
             const minRange = {
                 ...record,
             };
+            // 搞事情：v4.1 新增 绑定事件 改类型，需要把 事件逻辑的引用，全部迁移过去
+            if (nd.concept === 'BindEvent') {
+                if (minRange.node.concept === 'Identifier') {
+                    /**
+                     * 使用正则替换倒数第二个点和倒数第一个点之间的内容
+                     * 例如 elements.button_1.bindEvents.XXX.logics -> elements.button_1.bindEvents.YYY.logics
+                     */
+                    minRange.newValue = minRange.node.namespace.replace(/(\.bindEvents\.)([^.]+)(\.logics)$/, `$1${newValue}$3`);
+                    minRange.setTypeMethods = 'setNamespace';
+                }
+                else if (minRange.node === nd) {
+                    // 自己
+                    minRange.newValue = newValue;
+                    minRange.setTypeMethods = 'setName';
+                }
+            }
             // 节点上ts临时变量标识，如果有这个就不rename
             if (minRange.node?.noTsReName) {
                 return null;
@@ -1748,6 +1750,22 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             // 如果匹配到的节点是Identifier表达式
             if (minRange.node instanceof concepts_1.Identifier) {
+                /**
+                 * v4.1 新增 Identifier 可能是 页面元素 的事件逻辑 Logic 的引用 或 逻辑的引用
+                 * 页面元素 改名后，这个 Identifier 的 namespace 中间的元素名需要修改
+                 */
+                if (nd.concept === 'ViewElement') {
+                    minRange.setTypeMethods = 'setNamespace';
+                    /**
+                     * 使用正则替换第二个点和第三个点之间的内容
+                     * 例如 elements.XXX.bindEvents.click.logics -> elements.YYY.bindEvents.click.logics
+                     */
+                    const parts = minRange.node.namespace.split('.');
+                    if (parts.length >= 1) {
+                        parts[1] = newValue;
+                        minRange.newValue = parts.join('.');
+                    }
+                }
                 // 如果参数修改影响了Identifier, 就说明是上一级逻辑的引用，所以就直接过滤掉就好了
                 if (nd instanceof concepts_1.Param && minRange.node?.namespace?.endsWith('logics')) {
                     return null;
@@ -1826,7 +1844,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     minRange.setTypeMethods = 'setUrlValue';
                     minRange.newValue = newTextValue;
                 }
-                else if (minRange.node instanceof concepts_1.BindAttribute && NEED_SYNC_BIND_ATTRIBUTE.includes(minRange.node.name)) {
+                else if (minRange.node instanceof concepts_1.BindAttribute && nasl_language_server_core_1.specialStringRefs.includes(minRange.node.name)) {
                     // eslint-disable-next-line no-confusing-arrow
                     minRange.newValue = (minRange.node.value ?? '').split('.').map((v, i) => i ? v : newValue.charAt(0).toLowerCase() + newValue.slice(1)).join('.');
                     minRange.setTypeMethods = 'setValue';
@@ -1865,7 +1883,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             // 如果要修改实体属性
             if (nd instanceof concepts_1.EntityProperty) {
                 // 如果是修改实体属性，要同步绑定属性（属性名为 valueField / textField）
-                if (minRange.node instanceof concepts_1.BindAttribute && NEED_SYNC_BIND_ATTRIBUTE.includes(minRange.node.name)) {
+                if (minRange.node instanceof concepts_1.BindAttribute && nasl_language_server_core_1.specialStringRefs.includes(minRange.node.name)) {
                     // eslint-disable-next-line no-confusing-arrow
                     minRange.newValue = (minRange.node.value ?? '').split('.').slice(0, -1).concat(newValue).join('.');
                     minRange.setTypeMethods = 'setValue';
@@ -2388,6 +2406,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 'CallFunction',
                 'CallInterface',
                 'CallMicroserviceInterface',
+                'CallGatewayInterface',
                 'MemberExpression',
                 'Return',
                 'Variable',
@@ -3313,7 +3332,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 this.typerErrRecords.length = 0;
                 this.oqlRemoveNodesTsPath.clear();
                 this.semEnv.allocatedVEQNames.forEach(n => {
-                    this.semEnv.refMgr.qNameDefs.delete(n);
+                    this.semEnv.refMgr.gQNameDefs.delete(n);
                 });
                 this.semEnv.allocatedVEQNames.length = 0;
                 this.originProxyTargetNodes.clear();
@@ -3600,6 +3619,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
             ctxProcessV2?.getSubLogics();
         });
     }
+    async getClient() {
+        return (0, nasl_server_client_1.getNaslServerClient)(this);
+    }
 };
 exports.NaslServer = NaslServer;
 __decorate([