@lcap/nasl 3.5.0-beta.3 → 3.5.0-beta.5

package/src/generator/genBundleFiles.ts

@@ -32,6 +32,7 @@ interface Config {
   tenantType: any;
   tenantLevel: any;
   appid: string;
+  isExport?:string;
   devDnsAddr: string;
   miniEnable: boolean;
 }
@@ -614,7 +615,11 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
          `;
     content += str;
   }
-  const baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
+  let baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
+
+  if((config.isExport)as any){
+     baseUrl = '';
+  }
   let bundleMinPath = `${baseUrl}/bundle.${genHash(content)}.min.js`;
   if (frontend.basePath) {
     bundleMinPath = `${baseUrl}${frontend.basePath}/bundle.${genHash(content)}.min.js`;

package/src/natural/genNaturalTS.ts

@@ -88,3 +88,44 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode, focusedNod
   code += `\n\`\`\`\n`;
   return code;
 }
+
+export function genNaturalTSContextForAI(app: App) {
+  let code = ``;
+  /* 标准库 */
+  app.enums.forEach((enumeration) => code += `${enumeration?.toNaturalTS()}\n`);
+  app.dataSources.forEach((dataSource) => dataSource.entities
+    .forEach((entity) => code += `${entity?.toNaturalTS()}\n`));
+  app.structures
+    .forEach((structure) => code += `${structure?.toNaturalTS()}\n`);
+
+  app.frontendTypes.forEach((frontendType) => {
+    frontendType.frontends.forEach((frontend) => {
+      code += `namespace frontends.${frontend.name} {\n// 前端全局变量\n`;
+      const state = createCompilerState(undefined, { tabSize: 1 });
+      frontend?.variables?.forEach((variable) => {
+        code += 'let ';
+        code += variable?.toNaturalTS(shiftState(state, code, { inline: true }));
+        code += ';\n';
+      });
+  
+      code += '\n// 前端页面\n';
+      frontend?.views?.forEach((view) => {
+        code += view?.toNaturalTS(state, undefined, true);
+      });
+      code += `}\n`;
+    });
+  });
+
+  return code;
+}
+
+export function genNaturalTSStdlibForAI() {
+  return `${Object.values(naslStdlibMap).join('\n')}\n`;
+}
+
+export function genNaturalTSViewContextForAI(view: View) {
+  let code = ``;
+  code += view?.toNaturalTS(createCompilerState(''), view);
+
+  return code;
+}

package/src/natural/transformTSCode.ts

@@ -4,9 +4,12 @@ import * as babel from '@babel/core';
 import * as babelTypes from '@babel/types';
 import generate from '@babel/generator';
 import * as naslTypes from '../concepts';
-import { traverse } from '../utils';
 
-const debug = false;
+const DEBUG = false;
+function throwError(message: string) {
+  if (DEBUG) throw new Error(message);
+  else console.error(message);
+}
 
 export function tryParseTS(tsCode: string) {
   try {
@@ -91,10 +94,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           typeNamespace: 'app.dataSources.defaultDS',
         });
       }
-      console.error(node);
-      if (debug) {
-        throw new Error(`Unhandled node ${node.type}`);
-      }
+      throwError(`Unhandled node ${node.type}`);
     } else if (node.type === 'TSTypeLiteral') {
       return naslTypes.TypeAnnotation.createTypeAnonymousStructure(node.members.map((member: babelTypes.TSPropertySignature) => new naslTypes.StructureProperty({
         name: (member.key as babelTypes.Identifier).name,
@@ -114,10 +114,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
       });
       return union;
     } else {
-      console.error(node);
-      if (debug) {
-        throw new Error(`Unhandled node ${node.type}`);
-      }
+      throwError(`Unhandled node ${node.type}`);
     }
   }
   function transformParam(node: babelTypes.Identifier): naslTypes.Param {
@@ -169,6 +166,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
     if (calleeName === 'NewMap') {
       const keys: any = [];
       const values: any = [];
+
       node?.arguments?.[0]?.properties.forEach((arg: any) => {
         keys.push(transformLogicNode(arg.key));
         values.push(transformLogicNode(arg.value));
@@ -200,7 +198,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         rights,
       });
     }
-    if (calleeName === 'NewAnonymityStructure') {
+    if (calleeName === 'NewAnonymousStructure') {
       const properties: any = [];
       const rights: any = [];
       const structureProperties: any = [];
@@ -257,6 +255,8 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         }
       });
       if (newNode) return newNode;
+    } else if (node.type === 'CallExpression' && node.callee.type === 'CallExpression') {
+      // (function match() {})(...) 的情况
     } else if (node.type === 'CallExpression') {
       const callee = flatMemberExpression(node.callee);
       const calleeName = generate(node.callee as any).code;
@@ -308,6 +308,16 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           })) as naslTypes.Argument[],
         });
       }
+      if (calleeName.startsWith('nasl.logging.')) {
+        return new naslTypes.CallLogic({
+          calleeNamespace: 'nasl.logging',
+          calleeName: (callee[2] as babelTypes.Identifier).name,
+          shortcut: true,
+          arguments: node.arguments.map((arg) => new naslTypes.Argument({
+            expression: transformLogicNode(arg),
+          })) as naslTypes.Argument[],
+        });
+      }
       if (calleeName === 'nasl.util.jsonSerialize' || calleeName === 'nasl.util.jsonDeserialize') {
         const curCalleeName = (node.callee as any).property.name;
         return new naslTypes.CallLogic({
@@ -321,14 +331,22 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         });
       };
       if (calleeName.startsWith('nasl.util.')) {
-        const curCalleeName = callee.length === 3 ? (callee[callee.length - 1] as babelTypes.Identifier).name : (callee[0] as any).callee.property.name;
+        let curCalleeName: string;
+        if (callee.length === 3)
+          curCalleeName = (callee[callee.length - 1] as babelTypes.Identifier).name;
+        else {
+          let _callee = (callee[0] as any).callee;
+          while (_callee.type === 'CallExpression')
+            _callee = _callee.callee;
+          curCalleeName = _callee.property.name
+        }
         const argument = callee.length === 3 ? node.arguments : (callee[0] as any).arguments as any;
 
         if (['plus', 'minus', 'multiply', 'divide', 'remainder'].includes(curCalleeName)) {
           return handleBinaryExpression(curCalleeName, argument);
         };
 
-        if (['NewList', 'NewMap', 'NewEntity', 'NewAnonymityStructure'].includes(curCalleeName)) {
+        if (['NewList', 'NewMap', 'NewEntity', 'NewAnonymousStructure'].includes(curCalleeName)) {
           return handleNewExpression(curCalleeName, node);
         }
 
@@ -355,7 +373,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           const viewName = nsArr.pop();
 
           return new naslTypes.Destination({
-            viewNamespace: `app.frontends.pc.views${nsArr.map((item) => `.${item}.views`).join('')}`, // viewNamespace
+            viewNamespace: `app.frontendTypes.pc.frontends.pc.views${nsArr.map((item) => `.${item}.views`).join('')}`, // viewNamespace
             viewName, // viewName
             arguments: node.arguments.slice(1).map((arg) => new naslTypes.Argument({
               expression: transformLogicNode(arg),
@@ -448,6 +466,14 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
             })) as naslTypes.Argument[],
           });
         }
+        if (calleeName === 'FROM') {
+          // TODO
+          return new naslTypes.CallLogic({
+            calleeNamespace: `app.logics`,
+            calleeName,
+            arguments: [],
+          });
+        }
         return new naslTypes.CallLogic({
           calleeNamespace: `app.logics`,
           calleeName,
@@ -459,10 +485,10 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         return new naslTypes.CallInterface({
           calleeNamespace: generate((node.callee as any).object).code,
           calleeName: (callee[callee.length - 1] as babelTypes.Identifier).name,
-          arguments: node.arguments.map((arg: any) => new naslTypes.Argument({
-            keyword: arg.properties[0].key.name,
-            expression: transformLogicNode(arg.properties[0].value),
-          })) as naslTypes.Argument[],
+          arguments: node.arguments.length === 1 && node.arguments[0].type === 'ObjectExpression' ? node.arguments[0].properties.map((property) => property.type === 'ObjectProperty' && new naslTypes.Argument({
+            keyword: (property.key as babelTypes.Identifier).name,
+            expression: transformLogicNode(property.value),
+          })) as naslTypes.Argument[] : [],
         });
       }
       // else if (/destination/.test(calleeName)) {
@@ -521,15 +547,9 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           const switchStatement = transformLogicNode(newCallee[0].body.body[0]);
           return switchStatement;
         }
-        console.error(node);
-        if (debug) {
-          throw new Error(`Unhandled ArrowFunctionExpression node ${node.type}`);
-        }
+        throwError(`Unhandled ArrowFunctionExpression node ${node.type}`);
       } else {
-        console.error(node);
-        if (debug) {
-          throw new Error(`Unhandled node ${callee.map((item: babelTypes.Identifier) => item.name).join('.')} ${node.type}`);
-        }
+        throwError(`Unhandled node ${callee.map((item: babelTypes.Identifier) => item.name).join('.')} ${node.type}`);
       }
     } else if (node.type === 'IfStatement') {
       if (node.alternate && node.alternate.type === 'IfStatement') {
@@ -629,10 +649,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
       if (['Boolean', 'Integer', 'Double', 'Decimal', 'Long'].includes(calleeName)) {
         return transformLogicNode(node.arguments[0], naslTypes.TypeAnnotation.createPrimitive(calleeName));
       }
-      console.error(node);
-      if (debug) {
-        throw new Error(`Unhandled node ${node.type}`);
-      }
+      throwError(`Unhandled node ${node.type}`);
     } else if (node.type === 'ArrowFunctionExpression') {
       return new naslTypes.AnonymousFunction({
         params: node.params.map((param: babelTypes.Identifier) => transformParam(param)),
@@ -679,10 +696,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           right: transformLogicNode(node.right),
         });
       }
-      console.error(node);
-      if (debug) {
-        throw new Error(`Unhandled node ${node.type}`);
-      }
+      throwError(`Unhandled node ${node.type}`);
     } else if (node.type === 'UnaryExpression') {
       if (['!'].includes(node.operator)) {
         return new naslTypes.UnaryExpression({
@@ -696,10 +710,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           value: -node.argument.value,
         } as babelTypes.NumericLiteral);
       }
-      console.error(node);
-      if (debug) {
-        throw new Error(`Unhandled node ${node.type}`);
-      }
+      throwError(`Unhandled node ${node.type}`);
     } else if (node.type === 'UpdateExpression') {
       if (node.operator === '++' || node.operator === '--') {
         return new naslTypes.Assignment({
@@ -757,10 +768,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         rights,
       });
     } else {
-      console.error(node);
-      if (debug) {
-        throw new Error(`Unhandled node ${node.type}`);
-      }
+      throwError(`Unhandled node ${node.type}`);
     }
   }
 

package/src/server/formatTsUtils.ts

@@ -19,6 +19,10 @@ import {
   BackendVariable,
   AuthLogic,
   AuthLogicForCallInterface,
+  BusinessComponent,
+  BusinessLogic,
+  View,
+  ParamWithGroup
 } from '..';
 import { getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import { runGeneratorSync as runSync } from '../utils';
@@ -255,16 +259,16 @@ export function getPlatformType(type: string): string {
   return tsType;
 }
 export function isNoChildType(type: String) {
-  return (type?.startsWith('nasl.core') && !['String', 'Text', 'Email'].includes(type.split('.')[2])) || type?.startsWith('app.enums');
+  return (type?.startsWith?.('nasl.core') && !['String', 'Text', 'Email'].includes(type.split('.')[2])) || type?.startsWith?.('app.enums');
 }
 function findNode(typeKey: string, node: BaseNode) {
   let newType: Structure | Logic;
-  if (typeKey.startsWith('nasl.') && typeKey.includes('<')) {
+  if (typeKey?.startsWith?.('nasl.') && typeKey?.includes?.('<')) {
     const findGenericsIndex = typeKey.indexOf('<');
     typeKey = typeKey.substring(0, findGenericsIndex);
     const typeIndex = typeKey.lastIndexOf('.');
     newType = getNaslNodeByNodeCallee(typeKey.substring(0, typeIndex), typeKey.substring(typeIndex + 1, typeKey.length));
-  } else if (typeKey.startsWith('nasl.')) {
+  } else if (typeKey?.startsWith?.('nasl.')) {
     const typeIndex = typeKey.lastIndexOf('.');
     newType = getNaslNodeByNodeCallee(typeKey.substring(0, typeIndex), typeKey.substring(typeIndex + 1, typeKey.length));
   } else {
@@ -589,6 +593,7 @@ function getNextFlag(typeKey: string, typeKeyMap: Map<string, number>) {
   }
   return true;
 }
+
 // 格式化变量数据
 export function formatVariableData(data: unknown | variableItem[], node: types.SyntaxNode, parent?: any) {
   if (Array.isArray(data)) {
@@ -684,6 +689,7 @@ export function formatVariableData(data: unknown | variableItem[], node: types.S
       result = sortFirstVariableData(result, node);
     }
 
+
     return result.filter(Boolean);
   }
 }
@@ -691,8 +697,8 @@ export function formatVariableData(data: unknown | variableItem[], node: types.S
 // 从logic获取节点的icon
 function getNodeiconFromLogic(completionProperty: CompletionProperty, node: types.SyntaxNode): string {
   const { name: propName } = completionProperty;
-  const { view } = node as Param;
-  const logic = (node as Param).logic || (node as Param).OverriddenLogic || (node as Param).AuthLogic || (node as Param).AuthLogicForCallInterface;
+  const likeComponent = node.getAncestor('View') as View || node.getAncestor('BusinessComponent') as BusinessComponent;
+  const logic = (node as Param).logic || node.getAncestor('BusinessLogic') as BusinessLogic || (node as Param).OverriddenLogic || (node as Param).AuthLogic || (node as Param).AuthLogicForCallInterface;
 
   if (node.concept === 'Identifier' || node.concept === 'BindAttribute' || node.concept === 'MemberExpression') {
     const callLogic = node.getAncestor<CallLogic>('CallLogic');
@@ -703,18 +709,17 @@ function getNodeiconFromLogic(completionProperty: CompletionProperty, node: type
     }
   }
 
-  if (view) {
+  if (likeComponent) {
+    const params: any[] = likeComponent.params;
     // 前端逻辑调用
-    const { params } = view;
-
     if (params.find((item) => item.name === propName)) {
       return 'param';
     }
   }
 
   if (logic) {
-    const { params, returns } = logic;
-
+    const { returns } = logic;
+    const params: Param[] = logic.params;
     if (logic instanceof AuthLogicForCallInterface) {
       const { authParams } = logic;
       if (authParams.find((item) => item.name === completionProperty.name)) return 'api-auth-params';
@@ -759,7 +764,7 @@ function getNodeiconFromLogic(completionProperty: CompletionProperty, node: type
 function sortFirstVariableData(result: CompletionProperty[], node: BaseNode) {
   const newResult: CompletionProperty[] = [];
   const logic = (node as Param).logic;
-  const view = (node as Param).view;
+  const view: any  = (node as Param).view || (node as Param).getAncestor('BusinessComponent');
   if (view) {
     const { params, variables } = view;
     const list = [...params, ...variables];

package/src/server/getFunctions.ts

@@ -1,12 +1,12 @@
 import { getStdlibNamespace } from '..';
 
 export function getFunctions() {
-  return getStdlibNamespace().findChild('util');
+  return getStdlibNamespace()?.findChild?.('util');
 }
 
 export function getBuildInFunction(name: string) {
-  const utilFunctions = getFunctions().functions;
-  return utilFunctions.find((f) => f.name === name);
+  const utilFunctions = getFunctions()?.functions;
+  return utilFunctions?.find?.((f) => f.name === name);
 }
 
 export function getValidationInFunction(name: string) {

package/src/server/getProcesses.ts

@@ -267,7 +267,7 @@ export function syncMemberExpression(elem: ProcessElement | Process, callback: (
         }
       });
     }
-    if (el.type === 'ExclusiveGateway' || el.type === 'AutoTask') {
+    if (['ExclusiveGateway', 'AutoTask', 'InclusiveGateway'].includes(el.type)) {
       travelDown(el.logic, (node) => {
         if (node instanceof MemberExpression) {
           callback(node);
@@ -435,7 +435,7 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
     ],
   });
   processVariables.icon = 'Process';
-  if (processElem.type === 'ExclusiveGateway') {
+  if (['ExclusiveGateway', 'InclusiveGateway'].includes(processElem.type)) {
     const scopeVariable = new CompletionProperty({
       name: processElem.name,
       value: processElem.name,
@@ -589,7 +589,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement, exitConst
   });
   processVariables.expanded = true;
   processVariables.icon = 'Process';
-  if (processElem.type === 'ExclusiveGateway') {
+  if (['ExclusiveGateway', 'AutoTask', 'InclusiveGateway'].includes(processElem.type)) {
     const scopeVariable = new CompletionProperty({
       name: processElem.name,
       value: processElem.name,

package/src/server/naslServer.ts

@@ -89,6 +89,7 @@ import {
   types,
   asserts,
   BusinessComponent,
+  CallEvent,
 } from '../concepts';
 
 import * as utils from '../utils';
@@ -109,6 +110,7 @@ import { EventEmitter } from '../common/EventEmitter';
 import { traverse, FileNode } from '../utils';
 import { withQueueExecute } from '../decorators';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
+import { isConnection, isConnector } from '../concepts/utils/asserts';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
   Entity: 3,
@@ -147,6 +149,22 @@ let timer: number | null = null; //超时器用于收集导入接口相关
 // naslStdlib文件缓存；作为全局变量给多实例用复用
 const __naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map();
 
+/**
+ * 业务组件先特殊处理一下
+ * 获取业务组件的位置信息
+ */
+function getBusinessComponentPos(fileNode: BaseNode) {
+  if (fileNode.concept === 'BusinessComponent') {
+    const sourceMap = fileNode?.sourceMap?.get(fileNode);
+    if (sourceMap) {
+      const { start } = sourceMap;
+      return {
+        ...start,
+      }
+    }
+  }
+}
+
 // 联合类型切割取出类型
 export function getDisplayString2Type(displayString: string) {
   const targetString = displayString.match(/value:\s(\S+)\)/)?.[1];
@@ -1603,9 +1621,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 +1665,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 +2749,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 +3150,9 @@ class NaslServer {
         );
         const results = await Promise.all(promises);
         results.forEach((constRefs) => {
+          if(constRefs.symbolDisplayString.includes('(parameter)')) {
+            return;
+          }
           refsList = [...refsList, ...constRefs.refs];
         });
       }
@@ -3181,6 +3203,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,11 +3576,12 @@ 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;
               }
@@ -4377,8 +4403,12 @@ class NaslServer {
           (matchExpression instanceof Identifier || matchExpression instanceof MemberExpression)
         ) {
           const { currentSource, fileNode } = matchExpression?.getCurrentSource();
+          const currentCode = this.getNodeCode(fileNode, currentSource);
+
           fileNode.sourceMap.forEach((item, itemNode) => {
-            if (itemNode.concept === matchExpression.concept && isSameRange(item, currentSource)) {
+            const itemCode = this.getNodeCode(fileNode, item);
+
+            if (itemNode.concept === matchExpression.concept && itemCode === currentCode) {
               const jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
               jsonNode.typeAnnotation = matchExpression.__TypeAnnotation;
             }
@@ -4386,14 +4416,14 @@ class NaslServer {
         }
       }
       // 特殊处理param有类型错误的
-      if (node instanceof Param && value) {
+      if (value && (node instanceof Param)) {
         // index在nasl foreach上有脏数据
         if (node.parentKey === 'index' && node.parentNode instanceof ForEachStatement) {
           const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
           jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
         }
       }
-      if (node instanceof NewComposite && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
+      if (value && (node instanceof NewComposite) && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
         const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
         jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
       }
@@ -4556,11 +4586,13 @@ class NaslServer {
      * 删除节点中的一个内容,删除了以后，就查一下引用的地方一起查一下异常
      */
     let outputFiles: any = [];
+    // 先特殊处理业务组件
+    const pos = getBusinessComponentPos(fileNode);
     // 删除之前先查一下内容的依赖
     const newRefs = await this.references({
       file: result.filePath,
-      line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-      offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+      line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+      offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
     });
     // 如果是要删除的内容，就是当前的file节点，要关闭当前文件，就把内容置为空
     if (fileNode === targetNode) {
@@ -4595,12 +4627,14 @@ class NaslServer {
     const outputFiles = [{ file: result.filePath, fileContent: result.code }];
     // 创建和更新都用update，内部会做判断
     await this.updateFiles({ outputFiles });
+    // 先特殊处理业务组件
+    const pos = getBusinessComponentPos(fileNode);
 
     // 查一下新函数名的依赖
     const newRefs = await this.references({
       file: result.filePath,
-      line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-      offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+      line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+      offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
     });
 
     const files = new Set();
@@ -4645,12 +4679,13 @@ class NaslServer {
 
       // 修改名字新的添加进去，旧的置为空
       outputFiles.unshift({ file: oldFilePath, fileContent: '' });
-
+      // 先特殊处理业务组件
+      const pos = getBusinessComponentPos(fileNode);
       // 查一下旧文件名的依赖
       const oldRefs = await this.references({
         file: oldFilePath,
-        line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-        offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+        line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+        offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
       });
       oldRefs.refs.forEach((ref) => this.filesToCheck.add(ref.file));
       this.filesToCheck.delete(oldFilePath);
@@ -4947,6 +4982,9 @@ class NaslServer {
    */
   static getPropertyNames(fileNode: Connection|Connector) {
     const names: string[] = [];
+    if (!isConnection(fileNode) && !isConnector(fileNode)) {
+      return names;
+    }
     // TODO 如果不存在对应的 Connector 时，应该提示错误
     if (fileNode) {
       fileNode.properties.forEach((property) => {

package/src/server/translator.ts

@@ -457,6 +457,11 @@ Object.keys(NAMESPACE_CONCEPT_MAP).forEach((key) => {
 });
 
 export function translateDiagnosticMessage(message: string) {
+  // 业务组件先处理
+  const businessComponent = /Namespace 'app.frontendTypes.(.+?).businessComponents' has no exported member '(.+?)'./.exec(message);
+  if (businessComponent?.[1] && businessComponent?.[2]) {
+    return `找不到${businessComponent?.[1]}端下的业务组件${businessComponent?.[2]}`;
+  }
   for (const rule of TS_RULES) {
     const cap = rule.re.exec(message);
     if (cap) {
@@ -488,6 +493,8 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       return null;
     } else if (text.startsWith(`Function expression, which lacks return-type annotation, implicitly has an 'any[]' return type.`)) {
       return null;
+    } else if (/Property 'businessComponents' does not exist on type 'typeof (pc|h5)'./.exec(text)) {
+      return null;
     }
   }
   // 处理bindevent参数没传递的报错

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -413,7 +413,7 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
     const propertyTypeMaxLength: number =
       Number(
         property.rules
-          .find((item) => item.indexOf('max') > -1)
+          ?.find?.((item) => item.indexOf('max') > -1)
           ?.split('(')[1]
           .slice(0, -1)
       ) || 0;

package/src/templator/genGetBlock.ts

@@ -69,6 +69,7 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 
 export function genGetBlock(entity: Entity, oldNode: ViewElement) {
   const likeComponent = oldNode?.likeComponent;
+  const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const { ns } = entity;
   const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
 
@@ -85,7 +86,7 @@ export function genGetBlock(entity: Entity, oldNode: ViewElement) {
 {
     "viewParams": [
         {
-            "concept": "Param",
+            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }