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

package/src/server/naslServer.ts

@@ -88,7 +88,6 @@ import {
   UnaryExpression,
   types,
   asserts,
-  BusinessComponent,
 } from '../concepts';
 
 import * as utils from '../utils';
@@ -430,7 +429,7 @@ class NaslServer {
     const {
       structures = [],
       metadataTypes = [],
-      frontendTypes = [],
+      frontends = [],
       interfaces = [],
       enums = [],
       logics = [],
@@ -450,10 +449,6 @@ class NaslServer {
       namespaces = [],
     } = module as Connector;
 
-    const {
-      frontends = []
-    } = module as Module;
-
     yield* getTsFiles(structures, 'structure');
     yield* getTsFiles(metadataTypes, 'metadataType');
 
@@ -461,25 +456,20 @@ class NaslServer {
       yield* getTsFiles(overriddenLogics, 'overriddenLogic', OverriddenLogic);
       yield* getTsFiles(backend?.variables ?? [], 'backend_variable');
 
-      for (const frontendType of frontendTypes) {
-        yield* getTsFile(frontendType, 'frontendType');
-        for (const dep of frontendType.componentDependencies) {
-          results.push(...(yield* self.contentToFile(dep)));
+      for (const frontend of frontends) {
+        yield* getTsFile(frontend, 'frontend');
+        yield* getTsFiles(frontend.variables, 'frontend_variable');
+        yield* getTsFiles(concat(frontend.bindEvents, 'logics'), 'frontend_bindEvent_logic');
+
+        if (!config.closeViews) {
+          yield* view2TSFile(frontend.views);
         }
-        for (const frontend of frontendType.frontends) {
-          yield* getTsFile(frontend, 'frontend');
-          yield* getTsFiles(frontend.variables, 'frontend_variable');
-          yield* getTsFiles(concat(frontend.bindEvents, 'logics'), 'frontend_bindEvent_logic');
 
-          if (!config.closeViews) {
-            yield* view2TSFile(frontend.views);
-          }
+        for (const dep of frontend.componentDependencies) {
+          results.push(...(yield* self.contentToFile(dep)));
         }
-        // 业务组件
-        yield* getTsFiles(frontendType.businessComponents, 'businessComponents');
       }
     } else {
-      // 依赖库
       yield* getTsFiles(concat(frontends, 'logics' as any), 'frontend_logic');
     }
 
@@ -820,7 +810,7 @@ class NaslServer {
 
       const types = /<([^()]+)>/g.exec(displayString);
       const typeStr = types && types[1];
-      const app = node.getAncestor('App') as App;
+      const {app} = node;
       if (typeStr.includes('__name: "AStructure_')) {
         const properties: StructureProperty[] = [];
         typeStr.replace(/([^:\s]+):\s+([^;]+);/g, ($1, name, typeKey) => {
@@ -2189,7 +2179,7 @@ class NaslServer {
       const diagnostic = {
         node: fileNode,
         severity: 'error',
-        message: `连接器 ${fileNode.name} 参数配置有更新`,
+        message: `连接器 ${fileNode.name} 参数配置缺失`,
         // 保留原来的内容方便查询一些问题
         originalDiagnostic: {
           fileName: '',
@@ -2470,7 +2460,6 @@ class NaslServer {
       node.parentKey !== 'playground' &&
       node.parentKey !== 'consequent' &&
       node.parentNode?.parentNode?.concept !== 'CallInterface' &&
-      node.parentNode.concept !== 'Block' &&
       !node.__TypeAnnotation
     ) {
       let showErr = false;
@@ -3559,9 +3548,6 @@ class NaslServer {
               if (minRange.node !== node) {
                 return null;
               }
-            } else if (node instanceof BusinessComponent) {
-              minRange.setTypeMethods = 'setTag';
-              minRange.newValue = `bs-${newValue}`;
             } else if (!(node instanceof Role)) {
               /**
                * 无论是逻辑还是实体中的key，修改都不应该触发
@@ -3577,9 +3563,6 @@ class NaslServer {
               if (minRange.node !== node) {
                 return null;
               }
-            } else if (node instanceof BusinessComponent) {
-              minRange.setTypeMethods = 'setTag';
-              minRange.newValue = `bs-${newValue}`;
             } else if (!(node instanceof Role)) {
               /**
                * 无论是逻辑还是实体中的key，修改都不应该触发
@@ -3863,7 +3846,6 @@ class NaslServer {
       !(fileNode.parentNode instanceof Backend) &&
       !isConnectorLogic &&
       !(fileNode instanceof View) &&
-      !(fileNode instanceof BusinessComponent) &&
       !(fileNode instanceof ConfigProperty)
     ) {
       fileNode = fileNode.parentNode as FileNode & types.SyntaxNode;

package/src/server/translator.ts

@@ -11,7 +11,6 @@ import {
   EntityProperty,
   EntityIndex,
   View,
-  BusinessComponent,
   Destination,
   Enum,
   BindEvent,
@@ -173,11 +172,6 @@ const TS_RULES: Array<{
     result: '找不到配置参数$2',
     transforms: [transformType, transformType],
   },
-  {
-    re: /Property '(.+?)' is private and only accessible within class '(.+?)'./,
-    result: '“$1”是私有的，只能在“$2”中访问。',
-    transforms: [transformType, transformType],
-  },
   {
     re: /Object literal may only specify known properties, and '(.+?)' does not exist in type/,
     result: '当前参数$1，不可用。',
@@ -479,7 +473,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
   // const isFELogic = ['BindEvent', 'View'].includes(parentNode.concept);
 
   // 有一些节点报错信息不向外暴露,缺失一些原生标签等等的展示
-  if (node instanceof View || node instanceof BusinessComponent || node instanceof ViewElement) {
+  if (node instanceof View || node instanceof ViewElement) {
     if (text.startsWith(`'nasl.ui' has no exported member named `)) {
       return null;
     } else if (text.startsWith(`Property '`) && text.includes(`does not exist on type 'typeof ui'.`)) {

package/src/service/storage/init.ts

@@ -88,6 +88,7 @@ async function deleteExpiredRecords() {
       expiredRecordsRequest.onsuccess = (event: any) => {
         const cursor = event.target.result;
         if (cursor) {
+          console.log(cursor);
           objectStore.delete(cursor.primaryKey);
           cursor.continue();
         } else {
@@ -385,6 +386,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 +481,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 +653,7 @@ async function doAction(app: any, actionItem: any) {
   const uuid = uuidv4().replace(/-/g, '');
   const instructList = [{
     uuid,
+    realAction: action,
     actions: actionList,
     riskList: allRiskList
   }];
@@ -1015,6 +1043,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;
@@ -1182,7 +1213,7 @@ export async function loadApp(appId?: string) {
       roles: [],
       dependencies: [],
       interfaceDependencies: [],
-      frontendTypes: [],
+      frontends: [],
       metadataTypes: []
     });
   } else {

package/src/templator/genCreateBlock.ts

@@ -287,16 +287,16 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
  * @param resolver 实体创建 Action
  */
 export function genCreateBlock(entity: Entity, oldNode: ViewElement) {
-  const likeComponent = oldNode?.likeComponent;
+  const { view } = oldNode;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
   const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
   const nameGroup: NameGroup = {};
-  nameGroup.viewElementMainView = likeComponent.getViewElementUniqueName('form1');
-  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');
+  nameGroup.viewElementMainView = view.getViewElementUniqueName('form1');
+  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
 
   // 收集所有和本实体关联的实体
   const selectNameGroupMap: Map<string, NameGroup> = new Map();
@@ -309,8 +309,8 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement) {
       if (relationEntity) {
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         if (displayedProperty) {
-          const viewElementSelect = likeComponent.getViewElementUniqueName('select');
-          const selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);
+          const viewElementSelect = view.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
           selectNameGroup.viewElementSelect = viewElementSelect;
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -275,24 +275,24 @@ function genCreateLogic(nameGroup: NameGroup) {
 }
 
 export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
-  const likeComponent = oldNode?.likeComponent;
+  const { view } = oldNode;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = likeComponent.getViewElementUniqueName('tableView');
-  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
+  const viewElementMainView = view.getViewElementUniqueName('tableView');
+  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewElementSaveModal = likeComponent.getViewElementUniqueName('saveModal');
-  nameGroup.viewElementSaveModalForm = likeComponent.getViewElementUniqueName('saveModalForm');
-  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
-  nameGroup.viewLogicInit = likeComponent.getLogicUniqueName('init');
-  nameGroup.viewLogicCreate = likeComponent.getLogicUniqueName('create');
-  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');
-  nameGroup.viewLogicBlurUpdate = likeComponent.getLogicUniqueName('blurUpdate');
-  nameGroup.viewLogicReload = likeComponent.getLogicUniqueName('reload');
-  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewVariableInput = likeComponent.getVariableUniqueName('input');
-  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');
+  nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
+  nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
+  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  nameGroup.viewLogicInit = view.getLogicUniqueName('init');
+  nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
+  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
+  nameGroup.viewLogicBlurUpdate = view.getLogicUniqueName('blurUpdate');
+  nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
+  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewVariableInput = view.getVariableUniqueName('input');
+  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
 
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();
@@ -308,8 +308,8 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         if (displayedProperty) {
           entitySet.add(relationEntity);
-          const viewElementSelect = likeComponent.getViewElementUniqueName('select');
-          const selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);
+          const viewElementSelect = view.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
           selectNameGroup.viewElementSelect = viewElementSelect;
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');