@lcap/nasl 3.5.0-beta.4 → 3.6.0-alpha.2

package/out/server/naslServer.js

@@ -1377,9 +1377,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.logicSetWithComponentLogic = new Set();
         const self = this;
         const diagnostics = [];
-        if (fileNode instanceof concepts_1.View) {
+        if (fileNode instanceof concepts_1.View || fileNode instanceof concepts_1.BusinessComponent) {
             yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* attachView([node, value]) {
-                if (node instanceof concepts_1.ViewElement && node.view === fileNode) {
+                const likeComponent = node.getAncestor('View') || node.getAncestor('BusinessComponent');
+                if (node instanceof concepts_1.ViewElement && likeComponent === fileNode) {
                     if (node.tag) {
                         yield* utils.wrapForEachToGenerator(node.bindAttrs, (bindAttr) => {
                             if ((bindAttr.model || bindAttr.sync) && bindAttr.expression) {
@@ -1423,14 +1424,14 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         });
                     }
                 }
-                else if ((node instanceof concepts_1.Variable || node instanceof concepts_1.Return) && node.view === fileNode) {
+                else if ((node instanceof concepts_1.Variable || node instanceof concepts_1.Return) && likeComponent === fileNode) {
                     if (!node.typeAnnotation && !node.__TypeAnnotation) {
                         const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
                         let msg;
                         yield* fileNode.traverseChildrenGenerator((nodeIn) => {
                             if (nodeIn && (nodeIn instanceof concepts_1.BatchAssignment || (nodeIn instanceof concepts_1.Assignment && nodeIn.left?.name))) {
                                 // 子页面内部逻辑过滤
-                                if (nodeIn.view !== fileNode)
+                                if ((nodeIn.view || nodeIn.getAncestor('BusinessComponent')) !== fileNode)
                                     return;
                                 // 当局部变量、输出参数属于页面内逻辑时，需过滤同页面下不同逻辑下的同名变量
                                 if (node.logic && node.logic !== nodeIn.logic)
@@ -2512,7 +2513,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             yield;
         }
         if (!minRange) {
-            if (fileNode instanceof concepts_1.View) {
+            if (fileNode instanceof concepts_1.View || fileNode instanceof concepts_1.BusinessComponent) {
                 return { node: fileNode, item: sourceMap.get(fileNode) };
             }
             if (process.env.NODE_ENV === 'development') {
@@ -2897,6 +2898,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }));
                 const results = await Promise.all(promises);
                 results.forEach((constRefs) => {
+                    if (constRefs.symbolDisplayString.includes('(parameter)')) {
+                        return;
+                    }
                     refsList = [...refsList, ...constRefs.refs];
                 });
             }
@@ -2947,6 +2951,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     minRange.setTypeMethods = 'setCalleeNamespace';
                     minRange.newValue = `elements.${newValue}.logics`;
                 }
+                if (minRange.node instanceof concepts_1.CallEvent) {
+                    minRange.setTypeMethods = 'setCalleeName';
+                }
                 // 如果节点是实体修改引发calllogic修改
                 if (minRange.node instanceof concepts_1.CallLogic &&
                     (node instanceof concepts_1.Entity || node instanceof concepts_1.View || node instanceof concepts_1.Process || node instanceof concepts_1.ProcessElement)) {
@@ -3318,19 +3325,16 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 if (node instanceof concepts_1.Param && minRange.node instanceof concepts_1.Interface) {
                     return null;
                 }
-                // 如果是被影响的是页面
-                if (minRange.node instanceof concepts_1.View) {
-                    if (node instanceof concepts_1.View) {
+                // 如果是被影响的是页面/业务组件
+                if (minRange.node instanceof concepts_1.View || minRange.node instanceof concepts_1.BusinessComponent) {
+                    if (node instanceof concepts_1.View || node instanceof concepts_1.BusinessComponent) {
                         // 如果是子页面修改
                         // 父页面引起子页面改名，就可以不改了，自动同步
+                        // 页面中的业务组件，业务组件中的业务组件等都需要忽略
                         if (minRange.node !== node) {
                             return null;
                         }
                     }
-                    else if (node instanceof concepts_1.BusinessComponent) {
-                        minRange.setTypeMethods = 'setTag';
-                        minRange.newValue = `bs-${newValue}`;
-                    }
                     else if (!(node instanceof concepts_1.Role)) {
                         /**
                          * 无论是逻辑还是实体中的key，修改都不应该触发