@lcap/nasl 3.7.0-beta.4 → 3.7.0-beta.6

package/src/concepts/utils/types.ts

@@ -145,12 +145,15 @@ import type { AuthInterface } from '../AuthInterface__';
 import type { CallAuthInterface } from '../CallAuthInterface__';
 import type { TriggerEvent } from '../TriggerEvent__';
 import type { MsgTriggerEvent } from '../MsgTriggerEvent__';
+import type { InterfaceTriggerEvent } from '../InterfaceTriggerEvent__';
 import type { ConnectorTrigger } from '../ConnectorTrigger__';
 import type { TriggerLauncher } from '../TriggerLauncher__';
+import type { ConnectorTriggerLauncher } from '../ConnectorTriggerLauncher__';
 import type { MsgTriggerLauncher } from '../MsgTriggerLauncher__';
 import type { Connector } from '../Connector__';
 import type { CallConnector } from '../CallConnector__';
 import type { Connection } from '../Connection__';
+import type { ConnectorLogic } from '../ConnectorLogic__';
 
 /** concept 与类类型映射表 */
 export interface ConceptTypeofClassMap {
@@ -301,12 +304,15 @@ export interface ConceptTypeofClassMap {
   CallAuthInterface: typeof CallAuthInterface;
   TriggerEvent: typeof TriggerEvent;
   MsgTriggerEvent: typeof MsgTriggerEvent;
+  InterfaceTriggerEvent: typeof InterfaceTriggerEvent;
   ConnectorTrigger: typeof ConnectorTrigger;
   TriggerLauncher: typeof TriggerLauncher;
+  ConnectorTriggerLauncher: typeof ConnectorTriggerLauncher;
   MsgTriggerLauncher: typeof MsgTriggerLauncher;
   Connector: typeof Connector;
   CallConnector: typeof CallConnector;
   Connection: typeof Connection;
+  ConnectorLogic: typeof ConnectorLogic;
 }
 
 /** concept 与类实例类型映射表 */
@@ -458,12 +464,15 @@ export interface ConceptClassMap {
   CallAuthInterface: CallAuthInterface;
   TriggerEvent: TriggerEvent;
   MsgTriggerEvent: MsgTriggerEvent;
+  InterfaceTriggerEvent: InterfaceTriggerEvent;
   ConnectorTrigger: ConnectorTrigger;
   TriggerLauncher: TriggerLauncher;
+  ConnectorTriggerLauncher: ConnectorTriggerLauncher;
   MsgTriggerLauncher: MsgTriggerLauncher;
   Connector: Connector;
   CallConnector: CallConnector;
   Connection: Connection;
+  ConnectorLogic: ConnectorLogic;
 }
 
 export type SyntaxNode =
@@ -607,14 +616,16 @@ export type SyntaxNode =
   | ViewBlockWithImage
   | AuthInterface
   | CallAuthInterface
-  | TriggerEvent
   | MsgTriggerEvent
+  | InterfaceTriggerEvent
   | ConnectorTrigger
   | TriggerLauncher
+  | ConnectorTriggerLauncher
   | MsgTriggerLauncher
   | Connector
   | CallConnector
-  | Connection;
+  | Connection
+  | ConnectorLogic;
 
 export type SyntaxNodeConcept = SyntaxNode['concept'];
 
@@ -640,7 +651,8 @@ export type LogicNode =
   | Logic
   | AuthLogic
   | AuthLogicForCallInterface
-  | BusinessLogic;
+  | BusinessLogic
+  | ConnectorLogic;
 
 export type LogicNodeConcept = LogicNode['concept'];
 
@@ -766,13 +778,20 @@ export type ViewBlockNode =
 export type ViewBlockNodeConcept = ViewBlockNode['concept'];
 
 export type TriggerEventNode =
-  | TriggerEvent
-  | MsgTriggerEvent;
+  | MsgTriggerEvent
+  | InterfaceTriggerEvent;
 
 export type TriggerEventNodeConcept = TriggerEventNode['concept'];
 
 export type TriggerLauncherNode =
   | TriggerLauncher
+  | ConnectorTriggerLauncher
+  | MsgTriggerLauncher;
+
+export type TriggerLauncherNodeConcept = TriggerLauncherNode['concept'];
+
+export type ConnectorTriggerLauncherNode =
+  | ConnectorTriggerLauncher
   | MsgTriggerLauncher;
 
-export type TriggerLauncherNodeConcept = TriggerLauncherNode['concept'];
+export type ConnectorTriggerLauncherNodeConcept = ConnectorTriggerLauncherNode['concept'];

package/src/generator/genBundleFiles.ts

@@ -101,6 +101,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
 
   app.dependencies && modules.push(...app.dependencies);
   app.interfaceDependencies && modules.push(...app.interfaceDependencies);
+  app.connectorDependencies && modules.push(...app.connectorDependencies);
   frontend.views && views.push(...frontend.views);
   modules.forEach((module: Module) => {
     module.views && views.push(...module.views);
@@ -367,7 +368,6 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   const assetsInfo = app.genAllAssetsInfo(STATIC_URL, frontend.type);
   const customNames = JSON5.stringify(assetsInfo.custom.names);
 
-
   let content = `(function(){
         `;
   if (frontend.globalScaleEnabled) {
@@ -660,7 +660,12 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   if(config.isPreviewFe){
     const changeToRelativePath =(str:any)=>{
       const {pathname} = new URL(`http:${str}`)
-      return `${ pathname.split('/').filter(v=>v).slice(1).join('/')}`
+      let arr = pathname.split('/').filter(v=>v)
+      if( ['packages',config?.tenant].includes(arr[0]))  {
+        return `${arr.join('/')}`
+      }else {
+        return `${arr.slice(1).join('/')}`
+      }
     }
     jsAssetsList = jsAssetsList.map(changeToRelativePath)
     cssAssetsList = cssAssetsList.map(changeToRelativePath)
@@ -745,10 +750,15 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     }`
     }
 
-
     const loadMockAssets = `
     const loadJSWrap = (arr)=>{
-      LazyLoad.js(arr.map(url=>window.assetsDomain + url));
+      LazyLoad.js(arr.map(url=>{
+        if(url.includes('mockBundle')){
+          return window.userAssetsDomain + url
+        }else {
+          return window.assetsDomain + url
+        }
+      }));
     }
     const loadCSSWrap = (arr)=>{
       LazyLoad.css(arr.map(url=>window.assetsDomain + url));

package/src/generator/genMetaData.ts

@@ -93,6 +93,7 @@ export function genMetaData(app: App, frontend: Frontend, config: any) {
 
   app.dependencies && modules.push(...app.dependencies);
   app.interfaceDependencies && modules.push(...app.interfaceDependencies);
+  app.connectorDependencies && modules.push(...app.connectorDependencies);
 
   // 内置国际化枚举
   enums.push(...configurationEnums)

package/src/generator/permission.ts

@@ -194,6 +194,7 @@ export function getAllLogics(app: App) {
 
   app.dependencies && modules.push(...app.dependencies);
   app.interfaceDependencies && modules.push(...app.interfaceDependencies);
+  app.connectorDependencies && modules.push(...app.connectorDependencies);
 
   modules.forEach((module: Module) => {
     module.logics && logics.push(...module.logics);

package/src/generator/release-body/body.ts

@@ -16,8 +16,8 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
 
   let NaslAnnotatedJSON: any;
   try {
-    NaslAnnotatedJSON = await (app as any).naslServer.getNaslAnnotatedJSON(app, true);
-    opt.logPublishFunc?.('语言', '获取类型标注成功');
+    NaslAnnotatedJSON = await app.naslServer.getNaslAnnotatedJSON(app, true);
+    await opt.logPublishFunc?.('语言', '获取类型标注成功');
 
     // // 打印传给服务端的 nasl,为了服务端排查问题方便
     // if (globalThis.window) {
@@ -47,11 +47,11 @@ async function getFrontendBundleFiles(app: App, opt: InternalReleaseData) {
   let files: utils.GetPromise<ReturnType<typeof genFrontendBundleFiles>> = [];
 
   if (opt.frontends && opt.frontends.length) {
-    opt.logPublishFunc?.('代码', '生成页面代码：开始');
+    await opt.logPublishFunc?.('代码', '生成页面代码：开始');
+    app.naslServer.logger.time('生成前端页面');
     files = await genFrontendBundleFiles(app, opt.frontends, {
       ...opt.appInfo,
-      env: opt.env,
-      debug: opt.debug,
+      ...opt,
       appid: app.id,
       devDnsAddr: (app as any).devDnsAddr,
       miniEnable: (app as any).miniEnable,
@@ -65,9 +65,11 @@ async function getFrontendBundleFiles(app: App, opt: InternalReleaseData) {
       files = replaceAssetUrl(files, opt.appInfo.USER_STATIC_URL, opt.staticUrl);
     }
 
-    opt.logPublishFunc?.('代码', '生成页面代码：完成');
+    app.naslServer.logger.timeEnd('生成前端页面');
+    await opt.logPublishFunc?.('代码', '生成页面代码：完成');
   }
 
+
   return files;
 }
 
@@ -75,7 +77,7 @@ async function mergeBodyData(app: App, opt: InternalReleaseData) {
   await utils.delay(500);
 
   const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, opt.frontends);
-  opt.logPublishFunc?.('权限',  '分析权限数据成功！');
+  await opt.logPublishFunc?.('权限',  '分析权限数据成功！');
   const logicPageResourceDtoList = await genPermissionData(app);
   const allFrontends = getFrontendByTypes(app?.frontendTypes);
   const releaseFrontends = allFrontends.map((frontend: Frontend) => ({
@@ -92,6 +94,7 @@ async function mergeBodyData(app: App, opt: InternalReleaseData) {
     reportIdList: findAllReportIdList(app, opt.frontends),
     appId: app.id,
     env: opt.env,
+    branchId: opt.branchId,
     replicas: opt.replicas,
     appSpecification: opt.appSpecification,
     callbackLogicsName: app.getExtensionsCallbackLogics(),

package/src/generator/release-body/data.ts

@@ -17,10 +17,11 @@ import { Logger, File } from '../../utils';
 export async function getReleaseData(app: App, data: ReleaseData, naslServer: NaslServer, inputLogger?: Logger) {
   const { http, logger: defaultLogger } = naslServer;
   const logger = inputLogger ?? defaultLogger;
+  defaultLogger.time('前端生成器发布');
   const appInfo =  await getAppInfo(http, data);
-  logger.info('构建环境', '获取环境信息成功');
+  await logger.info('构建环境', '获取环境信息成功');
   const { version, fullVersion, dependencies } = await getVersionDetail(http, app);
-  logger.info('构建环境', '获取版本数据成功');
+  await logger.info('构建环境', '获取版本数据成功');
   const allFrontend = getFrontendByTypes(app.frontendTypes);
   const inputFrontendNames = (data.config.frontendNames ?? []).filter(Boolean);
   const releaseFrontends = inputFrontendNames.length > 0
@@ -29,13 +30,14 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
   const result: InternalReleaseData = {
     appInfo: appInfo as any,
     env: data.env,
+    branchId: data.branchId,
     debug: data.config.debug ?? false,
     replicas: data.replicas ?? 1,
     realRelease: data.config.mode === ReleaseMode.Release,
     isExport: data.config.mode === ReleaseMode.ExportCode,
     isPreviewFe: data.config.mode === ReleaseMode.ExportTemplate,
     ignoreFiles: data.config.ignoreFiles ?? false,
-    previewVersion: data.config.releaseVersion,
+    previewVersion: data.config.previewVersion,
     appSpecification: data.appSpecification,
     frontends: releaseFrontends,
     validations: {},
@@ -45,13 +47,13 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
   // 设置依赖数据
   if (app.packageInfos.length === 0) {
     app.packageInfos = await getPackageInfos(http, app, dependencies, appInfo.STATIC_URL, fullVersion);
-    logger.info('构建环境', '设置依赖库内容');
+    await logger.info('构建环境', '设置依赖库内容');
   }
 
   // 私有化环境，需要同步资源；内部环境暂不需要，针对使用 CDN 场景增加判断
   if (String(appInfo.isPrivatized) === 'true') {
     result.staticUrl = await staticResourceSync(http, data.appId, data.env, releaseFrontends);
-    logger.info('构建环境', '私有化部署同步资源成功');
+    await logger.info('构建环境', '私有化部署同步资源成功');
   }
 
   // 服务端验证规则
@@ -62,18 +64,19 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
       throw new Error(result.validations);
     }
     else {
-      logger.info('生成器', '服务端验证数据获取成功');
+      await logger.info('生成器', '服务端验证数据获取成功');
     }
   }
 
-  logger.info('构建环境', '构建环境完成，开始拼装发布数据');
+  await logger.info('构建环境', '构建环境完成，开始拼装发布数据');
 
   const releaseBody = await genReleaseBody(app, {
     ...result,
     logPublishFunc: (...message: string[]) => logger.info(...message),
   });
 
-  logger.info('前端生成器', '应用发布数据准备完成');
+  await logger.info('前端生成器', '应用发布数据准备完成');
+  defaultLogger.timeEnd('前端生成器发布');
 
   return releaseBody;
 }

package/src/generator/release-body/internal.ts

@@ -12,6 +12,7 @@ export type InputServerValidationData = { [key in string]: ServerValidationData[
 export interface InternalReleaseData {
   env: string;
   debug: boolean;
+  branchId: string;
   replicas: number;
   realRelease: boolean;
   ignoreFiles?: boolean;

package/src/generator/release-body/types.ts

@@ -12,6 +12,8 @@ export interface ReleaseData {
   appId: string;
   /** 发布环境 dev | online */
   env: string;
+  /** 分支 Id */
+  branchId: string;
   /** 副本数 */
   replicas: number;
   /** 应用特性版本 */
@@ -28,7 +30,7 @@ export interface ReleaseConfig {
   /** 忽略前端文件 */
   ignoreFiles?: boolean;
   /** 发布版本 */
-  releaseVersion?: string;
+  previewVersion?: string;
   /** 调试模式 */
   debug?: boolean;
   /**

package/src/manager/diagnostic.ts

@@ -38,20 +38,44 @@ export interface Diagnostic {
  */
 export interface DiagnosticRecord {
   id: string;
+
   logicId?: string;
-  // typeCheckNote: TypeCheckNote,
+
   filePath?: string;
   node: BaseNode;
   message: string;
   syntaxDiagnostics: Array<Diagnostic>;
   semanticDiagnostics: Array<Diagnostic>;
   suggestionDiagnostics: Array<Diagnostic>;
-  // processComponentId?: string,
-  // attributes?: TypeCheckAttribute[],
 }
 
 export class DiagnosticManager {
-  records: Array<DiagnosticRecord> = [];
+  private initVersionByFilePath(filePath: string) {
+    if (this.versions[filePath] === undefined) {
+      this.versions[filePath] = 0;
+    }
+    return this.versions[filePath];
+  }
+
+  incrementVersionByFilePath(filePath: string): number {
+    this.initVersionByFilePath(filePath);
+    return ++this.versions[filePath];
+  }
+
+  getVersionByFilePath(filePath: string) {
+    // 单纯 get 不需要写入
+    return this.versions[filePath] ?? 0;
+  }
+
+  deleteVersionByFilePath(filePath: string) {
+    if (!filePath) {
+      return true;
+    }
+    delete this.versions[filePath];
+  }
+
+  private versions: Record<string, number> = Object.create(null);
+  private records: Array<DiagnosticRecord> = [];
 
   push(record: DiagnosticRecord) {
     const index = this.records.findIndex((item) => item.id === record.id);
@@ -60,15 +84,7 @@ export class DiagnosticManager {
     } else {
       this.records.splice(index, 1, record);
     }
-
-    // if(record.typeCheckNote?.message?.filter)
-    //     record.typeCheckNote.message = record.typeCheckNote.message.filter((item) => !!item);
-
-    // if(!record.typeCheckNote || record.typeCheckNote.status === 'success'
-    //     || (record.typeCheckNote && record.typeCheckNote.message && record.typeCheckNote.message.length === 0))
-    //     return;
   }
-
   getRecord(id: string) {
     const index = this.records.findIndex((item) => item.id === id);
     return this.records[index];
@@ -76,27 +92,18 @@ export class DiagnosticManager {
 
   deleteOwn(id: string) {
     const index = this.records.findIndex((item) => item.id === id);
+    if (index !== -1) {
+      const path = this.records[index].filePath;
+      if (path) {
+        this.deleteVersionByFilePath(path);
+      }
+    }
     ~index && this.records.splice(index, 1);
   }
 
-  delete(id: string) {
-    // const node = vertexsMap.get(id);
-    // this.deleteOwn(id);
-    // if (node) {
-    //     const children: LogicItem[] = [];
-    //     // [...logicItemKeyOfLogicItem, ...logicItemArrayKeyOfLogicItem].forEach((key) => {
-    //     //     const item = (node as LogicItem)[key as keyof LogicItem];
-    //     //     if (item)
-    //     //         children = children.concat(item);
-    //     // });
-    //     children.forEach((item) => {
-    //         this.delete(item.id);
-    //     });
-    // }
-  }
-
   clear() {
     this.records.splice(0, this.records.length);
+    this.versions = Object.create(null);
   }
 
   pushAll(records: DiagnosticRecord[]) {
@@ -108,9 +115,6 @@ export class DiagnosticManager {
     return [].concat(
       ...this.records.map((record) => {
         const diagnostics: Diagnostic[] = [].concat(record.semanticDiagnostics, record.suggestionDiagnostics);
-        // if (!showTSError) {
-        //     diagnostics = diagnostics.filter((diagnostic) => chineseRE.test(diagnostic.message));
-        // }
         return diagnostics;
       })
     );

package/src/natural/genNaturalTS.ts

@@ -100,8 +100,8 @@ export const getNaslOql = () => {
   return { code, naslOql };
 };
 
-export const getEnums = (app: App, state: any, moduleIndexList?: string[]) => {
-  const needNamespace = moduleIndexList?.length >= 0;
+export const getEnums = (app: App, state: any, requiredIndexes?: string[]) => {
+  const needNamespace = requiredIndexes?.length >= 0;
   const namespace = 'app.enums';
   const data = [] as { description: string; code: string; }[];
   let code = '';
@@ -116,8 +116,8 @@ export const getEnums = (app: App, state: any, moduleIndexList?: string[]) => {
   return { code, namespace, enums: { namespace, data } };
 };
 
-export const getEntities = (app: App, state: any, moduleIndexList?: string[]) => {
-  const needNamespace = moduleIndexList?.length >= 0;
+export const getEntities = (app: App, state: any, requiredIndexes?: string[]) => {
+  const needNamespace = requiredIndexes?.length >= 0;
   const entities = [] as { namespace: string; data: { description: string; code: string; }[]; }[];
   let code = '';
   app.dataSources.forEach((dataSource) => {
@@ -139,8 +139,8 @@ export const getEntities = (app: App, state: any, moduleIndexList?: string[]) =>
   return { code, entities };
 };
 
-export const getStructures = (app: App, state: any, moduleIndexList?: string[]) => {
-  const needNamespace = moduleIndexList?.length >= 0;
+export const getStructures = (app: App, state: any, requiredIndexes?: string[]) => {
+  const needNamespace = requiredIndexes?.length >= 0;
   const data = [] as { description: string; code: string; }[];
   const namespace = `app.structures`;
   let code = '';
@@ -157,8 +157,8 @@ export const getStructures = (app: App, state: any, moduleIndexList?: string[])
   return { code, structures: { namespace, data } };
 };
 
-export const getLogics = (app: App, currentNode: BaseNode, moduleIndexList?: string[]) => {
-  const hasModuleIndexList = moduleIndexList?.length > 0;
+export const getLogics = (app: App, currentNode: BaseNode, requiredIndexes?: string[]) => {
+  const hasModuleIndexList = requiredIndexes?.length > 0;
   const data = [] as { description: string; code: string; }[];
   const namespace = `app.logics`;
   let code = '';
@@ -166,9 +166,9 @@ export const getLogics = (app: App, currentNode: BaseNode, moduleIndexList?: str
     ?.filter((logic) => logic !== currentNode && !logic.name.startsWith('LCAP'))
     ?.forEach((logic, index) => {
       const logicIndex = `6-${index}`;
-      if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex)) return;
-      const rename = moduleIndexList?.length >= 0 ? logic?.calleewholeKey : undefined;
-      const needNamespace = moduleIndexList?.length >= 0;
+      if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex)) return;
+      const rename = requiredIndexes?.length >= 0 ? logic?.calleewholeKey : undefined;
+      const needNamespace = requiredIndexes?.length >= 0;
       const tempCode = `${logic?.toNaturalTS({ needNamespace, rename, declaration: true })}`;
       const description = logic?.description || '';
       code += `[${logicIndex}]${description} ${tempCode}\n`;
@@ -177,8 +177,8 @@ export const getLogics = (app: App, currentNode: BaseNode, moduleIndexList?: str
   return { code, appLogics: { namespace, data } };
 };
 
-export const getModuleInterfaces = (app: App, state: any, moduleIndexList?: string[]) => {
-  const hasModuleIndexList = moduleIndexList?.length > 0;
+export const getModuleInterfaces = (app: App, state: any, requiredIndexes?: string[]) => {
+  const hasModuleIndexList = requiredIndexes?.length > 0;
   const interfaceDependencies = [] as {
     name: string;
     structures: { namespace: string; data: { description: string; code: string; }[]; };
@@ -202,14 +202,14 @@ export const getModuleInterfaces = (app: App, state: any, moduleIndexList?: stri
     const logicData = [] as { description: string; code: string; }[];
     interfaceDependency?.interfaces?.forEach((interface_: any, index) => {
       const interfaceIndex = `7-${moduleIndex}-${index}`;
-      if (hasModuleIndexList && !moduleIndexList?.includes(interfaceIndex)) return;
+      if (hasModuleIndexList && !requiredIndexes?.includes(interfaceIndex)) return;
       const description = interface_?.description || '';
-      const interfaceName = moduleIndexList?.length >= 0 ? interface_?.calleewholeKey : undefined;
-      const needNamespace = moduleIndexList?.length >= 0;
+      const interfaceName = requiredIndexes?.length >= 0 ? interface_?.calleewholeKey : undefined;
+      const needNamespace = requiredIndexes?.length >= 0;
       const tempCode = interface_?.toNaturalTS(createCompilerState('', { needNamespace }), interfaceName);
       logicData.push({ description, code: tempCode });
 
-      if (moduleIndexList?.includes(interfaceIndex)) {
+      if (requiredIndexes?.includes(interfaceIndex)) {
         code += getLogicStructures(interface_, 'interface', { description, codeStr: tempCode }, structureNamespace);
       } else {
         code += `[${interfaceIndex}]${description} ${tempCode}\n`;
@@ -222,8 +222,8 @@ export const getModuleInterfaces = (app: App, state: any, moduleIndexList?: stri
   return { code, interfaceDependencies };
 };
 
-export const getConnectors = (app: App, state: any, moduleIndexList?: string[]) => {
-  const hasModuleIndexList = moduleIndexList?.length > 0;
+export const getConnectors = (app: App, state: any, requiredIndexes?: string[]) => {
+  const hasModuleIndexList = requiredIndexes?.length > 0;
   const connections = [] as {
     name: string;
     structures: { namespace: string; data: { description: string; code: string; }[]; };
@@ -250,14 +250,14 @@ export const getConnectors = (app: App, state: any, moduleIndexList?: string[])
     connection?.connector?.namespaces?.forEach((namespace: Namespace, namespaceIndex: number) => {
       namespace?.logics?.forEach((logic: Logic, index) => {
         const logicIndex = `8-${connectionIndex}-${namespaceIndex}-${index}`;
-        if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex)) return;
+        if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex)) return;
         const description = `${logic?.description || logic?.title || ''}`;
-        const rename = moduleIndexList?.length >= 0 ? `${connection?.name}.${logic?.calleewholeKey}` : undefined;
-        const needNamespace = moduleIndexList?.length >= 0;
+        const rename = requiredIndexes?.length >= 0 ? `${connection?.name}.${logic?.calleewholeKey}` : undefined;
+        const needNamespace = requiredIndexes?.length >= 0;
         const tempCode = `${logic?.toNaturalTS(shiftState(state, code, { needNamespace, rename, declaration: true }))}`;
         logicData.push({ description, code: tempCode });
 
-        if (moduleIndexList?.includes(logicIndex)) {
+        if (requiredIndexes?.includes(logicIndex)) {
           code += getLogicStructures(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
         } else {
           code += `[${logicIndex}]${description} ${tempCode}\n`;
@@ -268,14 +268,14 @@ export const getConnectors = (app: App, state: any, moduleIndexList?: string[])
     if (!connection?.connector?.namespaces?.length && connection?.connector?.logics?.length) {
       connection?.connector?.logics.forEach((logic: Logic, index: number) => {
         const logicIndex = `8-${connectionIndex}-${index}`;
-        if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex)) return;
+        if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex)) return;
         const description = logic?.description || '';
-        const rename = moduleIndexList?.length >= 0 ? `${connection?.name}.${logic?.calleewholeKey}` : undefined;
-        const needNamespace = moduleIndexList?.length >= 0;
+        const rename = requiredIndexes?.length >= 0 ? `${connection?.name}.${logic?.calleewholeKey}` : undefined;
+        const needNamespace = requiredIndexes?.length >= 0;
         const tempCode = `${logic?.toNaturalTS(shiftState(state, code, { needNamespace, rename, declaration: true }))}`;
         logicData.push({ description, code: tempCode });
 
-        if (moduleIndexList?.includes(logicIndex)) {
+        if (requiredIndexes?.includes(logicIndex)) {
           code += getLogicStructures(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
         } else {
           code += `[${logicIndex}]${description} ${tempCode}\n`;
@@ -288,8 +288,8 @@ export const getConnectors = (app: App, state: any, moduleIndexList?: string[])
   return { code, connections };
 };
 
-export const getDependencies = (app: App, state: any, moduleIndexList?: string[]) => {
-  const hasModuleIndexList = moduleIndexList?.length > 0;
+export const getDependencies = (app: App, state: any, requiredIndexes?: string[]) => {
+  const hasModuleIndexList = requiredIndexes?.length > 0;
   const dependencies = [] as {
     name: string;
     structures: { namespace: string; data: { description: string; code: string; }[]; };
@@ -315,14 +315,14 @@ export const getDependencies = (app: App, state: any, moduleIndexList?: string[]
       const logicData = [] as { description: string; code: string; }[];
       module?.logics?.forEach((logic, index) => {
         const logicIndex = `9-${moduleIndex}-${index}`;
-        if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex)) return;
+        if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex)) return;
         const description = logic?.description || '';
-        const rename = moduleIndexList?.length >= 0 ? logic?.calleewholeKey : undefined;
-        const needNamespace = moduleIndexList?.length >= 0;
+        const rename = requiredIndexes?.length >= 0 ? logic?.calleewholeKey : undefined;
+        const needNamespace = requiredIndexes?.length >= 0;
         const tempCode = `${logic?.toNaturalTS(shiftState(state, code, { needNamespace, rename, declaration: true }))}`;
         logicData.push({ description, code: tempCode });
 
-        if (moduleIndexList?.includes(logicIndex)) {
+        if (requiredIndexes?.includes(logicIndex)) {
           code += getLogicStructures(logic, 'extension', { description, codeStr: tempCode }, structureNamespace);
         } else {
           code += `[${logicIndex}]${description} ${tempCode}\n`;
@@ -427,7 +427,7 @@ export const getCurrentNodeContext = (currentNode: BaseNode, focusedNodePath?: s
   return { code: genTsBlock(code), currentLogic: code };
 };
 
-export function genNaturalTSContext(app: App, currentNode?: BaseNode, focusedNodePath?: string, moduleIndexList?: string[]) {
+export function genNaturalTSContext(app: App, currentNode?: BaseNode, focusedNodePath?: string, requiredIndexes?: string[]) {
   const frontend = currentNode?.getAncestor('Frontend') as Frontend;
   const logicType = currentNode?.parentNode?.concept === 'App' ? 'global_logic' : 'view_logic';
   const state = createCompilerState();
@@ -450,28 +450,28 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode, focusedNod
 
   code += '\n### [5]全局上下文\n';
   code += '\n#### [5-0]枚举\n';
-  code += getEnums(app, state, moduleIndexList).code;
+  code += getEnums(app, state, requiredIndexes).code;
 
   code += '\n#### [5-1]实体\n';
-  code += getEntities(app, state, moduleIndexList).code;
+  code += getEntities(app, state, requiredIndexes).code;
 
   code += '\n#### [5-2]可用的数据结构\n';
-  code += getStructures(app, state, moduleIndexList).code;
+  code += getStructures(app, state, requiredIndexes).code;
 
   code += '\n### [6]服务端逻辑\n';
-  code += getLogics(app, currentNode, moduleIndexList).code;
+  code += getLogics(app, currentNode, requiredIndexes).code;
 
   code += '\n### [7]可调用的接口列表\n';
-  code += getModuleInterfaces(app, state, moduleIndexList).code;
+  code += getModuleInterfaces(app, state, requiredIndexes).code;
 
   if (app?.connections?.length > 0 && logicType === 'global_logic') {
     code += '\n### [8]连接器逻辑列表\n';
-    code += getConnectors(app, state, moduleIndexList).code;
+    code += getConnectors(app, state, requiredIndexes).code;
   }
 
   if (app?.dependencies?.length > 0) {
     code += '\n### [9]依赖库逻辑列表\n';
-    code += getDependencies(app, state, moduleIndexList).code;
+    code += getDependencies(app, state, requiredIndexes).code;
   }
 
   if (frontend) {

package/src/natural/prompt/analyzeClaims.ts

@@ -2,7 +2,7 @@ export const analyzeClaims = (params: any) => {
   const { logicType } = params;
   const claims = `
   - Knowledge 是你的知识库，你可以参考，但是你最终制定的计划中禁止包含方法或者函数名
-  - moduleIndexList 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引
+  - requiredIndexes 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引
   - 如果用户没有特别指明是打印(日志/输出结果)，"输出结果"一律按照"返回输出结果"处理
   - 涉及到查询、获取数据时，先查找当前上下文[6/7/8/9]中是否有相关的方法，如果没有，再考虑实体的方法
     - 实体的 get 方法一次只能获取一条数据，返回一个对象，无法返回列表。
@@ -14,12 +14,13 @@ export const analyzeClaims = (params: any) => {
   const claimsMap = {
     global_logic: `
 - Knowledge 是你的知识库，你可以参考，但是你最终制定的计划中禁止包含方法或者函数名
-- moduleIndexList 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引
+- requiredIndexes 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引
 - 如果用户没有特别指明是打印(日志/输出结果)，"输出结果"一律按照"返回输出结果"处理
 - 如果用户的需求涉及定时或延时等操作，请提示用户：当前暂不支持定时或延时操作，请调整后重新输入。
 - 如果用户的需求需要调用某个方法并且当前上下文中不存在时，请提示用户：当前应用中暂无该方法，请先导入相关依赖库或连接器模块
     - 例如：加解密依赖库中的方法
-- 当前逻辑类型下暂不支持跳转页面功能，请提示用户: 如果需要跳转页面，请切换到前端页面逻辑或事件逻辑
+- 当前逻辑类型下暂不支持跳转页面功能，请提示用户: 如果需要跳转页面，请切换到前端页面逻辑或事件逻辑。
+- 当前逻辑类型下暂不支持弹出消息/弹窗消息功能，请提示用户: 当前逻辑类型暂不支持此功能。
 - 分析用户的需求，当需要从实体中获取或者查询数据时
     - 优先使用 SQL 的查询和数据操纵能力: 例如 JOIN、SUM、GROUP_BY 等能力
     - 使用 SQL 语句同时实现查询和计算