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

package/src/server/naslServer.ts

@@ -89,6 +89,7 @@ import {
   types,
   asserts,
   BusinessComponent,
+  CallEvent,
 } from '../concepts';
 
 import * as utils from '../utils';
@@ -1603,9 +1604,10 @@ class NaslServer {
     const self = this;
     const diagnostics: Diagnostic[] = [];
 
-    if (fileNode instanceof View) {
+    if (fileNode instanceof View || fileNode instanceof BusinessComponent) {
       yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* attachView([node, value]) {
-        if (node instanceof ViewElement && node.view === fileNode) {
+        const likeComponent = node.getAncestor('View') || node.getAncestor('BusinessComponent');
+        if (node instanceof ViewElement && likeComponent === fileNode) {
           if (node.tag) {
             yield* utils.wrapForEachToGenerator(node.bindAttrs, (bindAttr) => {
               if ((bindAttr.model || bindAttr.sync) && bindAttr.expression) {
@@ -1646,14 +1648,14 @@ class NaslServer {
               }
             });
           }
-        } else if ((node instanceof Variable || node instanceof Return) && node.view === fileNode) {
+        } else if ((node instanceof Variable || node instanceof Return) && likeComponent === fileNode) {
           if (!node.typeAnnotation && !node.__TypeAnnotation) {
             const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
             let msg;
             yield* fileNode.traverseChildrenGenerator((nodeIn) => {
               if (nodeIn && (nodeIn instanceof BatchAssignment || (nodeIn instanceof Assignment && nodeIn.left?.name))) {
                 // 子页面内部逻辑过滤
-                if (nodeIn.view !== fileNode) return;
+                if ((nodeIn.view || nodeIn.getAncestor('BusinessComponent')) !== fileNode) return;
                 // 当局部变量、输出参数属于页面内逻辑时，需过滤同页面下不同逻辑下的同名变量
                 if (node.logic && node.logic !== nodeIn.logic) return;
                 // 跟变量无关的赋值过滤
@@ -2730,7 +2732,7 @@ class NaslServer {
     }
 
     if (!minRange) {
-      if (fileNode instanceof View) {
+      if (fileNode instanceof View || fileNode instanceof BusinessComponent) {
         return { node: fileNode, item: sourceMap.get(fileNode) } as MinRange;
       }
       if (process.env.NODE_ENV === 'development') {
@@ -3131,6 +3133,9 @@ class NaslServer {
         );
         const results = await Promise.all(promises);
         results.forEach((constRefs) => {
+          if(constRefs.symbolDisplayString.includes('(parameter)')) {
+            return;
+          }
           refsList = [...refsList, ...constRefs.refs];
         });
       }
@@ -3181,6 +3186,9 @@ class NaslServer {
             minRange.setTypeMethods = 'setCalleeNamespace';
             minRange.newValue = `elements.${  newValue  }.logics`;
           }
+          if (minRange.node instanceof CallEvent) {
+            minRange.setTypeMethods = 'setCalleeName';
+          }
           // 如果节点是实体修改引发calllogic修改
           if (
             minRange.node instanceof CallLogic &&
@@ -3551,17 +3559,15 @@ class NaslServer {
           if (node instanceof Param && minRange.node instanceof Interface) {
             return null;
           }
-          // 如果是被影响的是页面
-          if (minRange.node instanceof View) {
-            if (node instanceof View) {
+          // 如果是被影响的是页面/业务组件
+          if (minRange.node instanceof View || minRange.node instanceof BusinessComponent) {
+            if (node instanceof View || node instanceof BusinessComponent) {
               // 如果是子页面修改
               // 父页面引起子页面改名，就可以不改了，自动同步
+              // 页面中的业务组件，业务组件中的业务组件等都需要忽略
               if (minRange.node !== node) {
                 return null;
               }
-            } else if (node instanceof BusinessComponent) {
-              minRange.setTypeMethods = 'setTag';
-              minRange.newValue = `bs-${newValue}`;
             } else if (!(node instanceof Role)) {
               /**
                * 无论是逻辑还是实体中的key，修改都不应该触发

package/src/service/storage/init.ts

@@ -385,6 +385,29 @@ const handleAIPoint = (app: any, actionItem: any) => {
   }
 }
 
+const isBreakpointEvent = (event: any) => {
+  const originEvent = event?.originEvent;
+  const object = originEvent?.object || {};
+  const oldObject = originEvent?.oldObject || {};
+
+  if (typeof object !== 'object') {
+    return false;
+  }
+
+  if (typeof oldObject !== 'object') {
+    return false;
+  }
+
+  const source = { ...object, ...oldObject };
+  const keys = Object.keys(source);
+
+  if (keys.length !== 1) {
+    return false;
+  }
+
+  return keys[0] === 'breakpoint';
+};
+
 /**
  *  执行更新
  */
@@ -457,8 +480,11 @@ async function doAction(app: any, actionItem: any) {
         const emitTarget = event?.originEvent?.target as types.SyntaxNode;
         const _path: string = event.originEvent.path;
         const _root = _path.split('.')?.[1] || '';
+        const breakabled = isBreakpointEvent(event);
         if (['backend', 'overriddenLogics', 'dataSources', 'processes', 'roles', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies', 'authLogics', 'authLogicsForCallInterface', 'triggerLaunchers', 'connections'].some((item) => _root.startsWith(item))) {
-          hasBackEnd = true;
+          if (!breakabled) {
+            hasBackEnd = true;
+          }
         }
         if (emitTarget) {
           if (emitTarget.concept === 'App') {
@@ -626,6 +652,7 @@ async function doAction(app: any, actionItem: any) {
   const uuid = uuidv4().replace(/-/g, '');
   const instructList = [{
     uuid,
+    realAction: action,
     actions: actionList,
     riskList: allRiskList
   }];
@@ -1015,6 +1042,9 @@ export function handleApp(app: ProxyApp) {
         });
       }, 2500);
     }
+
+    if (event?.action === 'move') proxyApp._action = event.action;
+
     if (!proxyApp._isCollectingCount) {
       proxyApp._actionMsg = event?.actionMsg;
       proxyApp._action = event?.action;