@lcap/nasl 3.7.0-beta.5 → 3.7.0-beta.7

package/out/natural/genNaturalTS.js

@@ -100,8 +100,8 @@ const getNaslOql = () => {
     return { code, naslOql };
 };
 exports.getNaslOql = getNaslOql;
-const getEnums = (app, state, moduleIndexList) => {
-    const needNamespace = moduleIndexList?.length >= 0;
+const getEnums = (app, state, requiredIndexes) => {
+    const needNamespace = requiredIndexes?.length >= 0;
     const namespace = 'app.enums';
     const data = [];
     let code = '';
@@ -116,8 +116,8 @@ const getEnums = (app, state, moduleIndexList) => {
     return { code, namespace, enums: { namespace, data } };
 };
 exports.getEnums = getEnums;
-const getEntities = (app, state, moduleIndexList) => {
-    const needNamespace = moduleIndexList?.length >= 0;
+const getEntities = (app, state, requiredIndexes) => {
+    const needNamespace = requiredIndexes?.length >= 0;
     const entities = [];
     let code = '';
     app.dataSources.forEach((dataSource) => {
@@ -139,8 +139,8 @@ const getEntities = (app, state, moduleIndexList) => {
     return { code, entities };
 };
 exports.getEntities = getEntities;
-const getStructures = (app, state, moduleIndexList) => {
-    const needNamespace = moduleIndexList?.length >= 0;
+const getStructures = (app, state, requiredIndexes) => {
+    const needNamespace = requiredIndexes?.length >= 0;
     const data = [];
     const namespace = `app.structures`;
     let code = '';
@@ -157,8 +157,8 @@ const getStructures = (app, state, moduleIndexList) => {
     return { code, structures: { namespace, data } };
 };
 exports.getStructures = getStructures;
-const getLogics = (app, currentNode, moduleIndexList) => {
-    const hasModuleIndexList = moduleIndexList?.length > 0;
+const getLogics = (app, currentNode, requiredIndexes) => {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const data = [];
     const namespace = `app.logics`;
     let code = '';
@@ -166,10 +166,10 @@ const getLogics = (app, currentNode, moduleIndexList) => {
         ?.filter((logic) => logic !== currentNode && !logic.name.startsWith('LCAP'))
         ?.forEach((logic, index) => {
         const logicIndex = `6-${index}`;
-        if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex))
+        if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex))
             return;
-        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({ needNamespace, rename, declaration: true })}`;
         const description = logic?.description || '';
         code += `[${logicIndex}]${description} ${tempCode}\n`;
@@ -178,8 +178,8 @@ const getLogics = (app, currentNode, moduleIndexList) => {
     return { code, appLogics: { namespace, data } };
 };
 exports.getLogics = getLogics;
-const getModuleInterfaces = (app, state, moduleIndexList) => {
-    const hasModuleIndexList = moduleIndexList?.length > 0;
+const getModuleInterfaces = (app, state, requiredIndexes) => {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const interfaceDependencies = [];
     let code = '';
     app?.interfaceDependencies?.forEach((interfaceDependency, moduleIndex) => {
@@ -198,14 +198,14 @@ const getModuleInterfaces = (app, state, moduleIndexList) => {
         const logicData = [];
         interfaceDependency?.interfaces?.forEach((interface_, index) => {
             const interfaceIndex = `7-${moduleIndex}-${index}`;
-            if (hasModuleIndexList && !moduleIndexList?.includes(interfaceIndex))
+            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((0, translator_1.createCompilerState)('', { needNamespace }), interfaceName);
             logicData.push({ description, code: tempCode });
-            if (moduleIndexList?.includes(interfaceIndex)) {
+            if (requiredIndexes?.includes(interfaceIndex)) {
                 code += (0, exports.getLogicStructures)(interface_, 'interface', { description, codeStr: tempCode }, structureNamespace);
             }
             else {
@@ -218,8 +218,8 @@ const getModuleInterfaces = (app, state, moduleIndexList) => {
     return { code, interfaceDependencies };
 };
 exports.getModuleInterfaces = getModuleInterfaces;
-const getConnectors = (app, state, moduleIndexList) => {
-    const hasModuleIndexList = moduleIndexList?.length > 0;
+const getConnectors = (app, state, requiredIndexes) => {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const connections = [];
     let code = '';
     app?.connections?.forEach((connection, connectionIndex) => {
@@ -239,14 +239,14 @@ const getConnectors = (app, state, moduleIndexList) => {
         connection?.connector?.namespaces?.forEach((namespace, namespaceIndex) => {
             namespace?.logics?.forEach((logic, index) => {
                 const logicIndex = `8-${connectionIndex}-${namespaceIndex}-${index}`;
-                if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex))
+                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((0, translator_1.shiftState)(state, code, { needNamespace, rename, declaration: true }))}`;
                 logicData.push({ description, code: tempCode });
-                if (moduleIndexList?.includes(logicIndex)) {
+                if (requiredIndexes?.includes(logicIndex)) {
                     code += (0, exports.getLogicStructures)(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
                 }
                 else {
@@ -257,14 +257,14 @@ const getConnectors = (app, state, moduleIndexList) => {
         if (!connection?.connector?.namespaces?.length && connection?.connector?.logics?.length) {
             connection?.connector?.logics.forEach((logic, index) => {
                 const logicIndex = `8-${connectionIndex}-${index}`;
-                if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex))
+                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((0, translator_1.shiftState)(state, code, { needNamespace, rename, declaration: true }))}`;
                 logicData.push({ description, code: tempCode });
-                if (moduleIndexList?.includes(logicIndex)) {
+                if (requiredIndexes?.includes(logicIndex)) {
                     code += (0, exports.getLogicStructures)(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
                 }
                 else {
@@ -278,8 +278,8 @@ const getConnectors = (app, state, moduleIndexList) => {
     return { code, connections };
 };
 exports.getConnectors = getConnectors;
-const getDependencies = (app, state, moduleIndexList) => {
-    const hasModuleIndexList = moduleIndexList?.length > 0;
+const getDependencies = (app, state, requiredIndexes) => {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const dependencies = [];
     let code = '';
     app?.dependencies
@@ -300,14 +300,14 @@ const getDependencies = (app, state, moduleIndexList) => {
         const logicData = [];
         module?.logics?.forEach((logic, index) => {
             const logicIndex = `9-${moduleIndex}-${index}`;
-            if (hasModuleIndexList && !moduleIndexList?.includes(logicIndex))
+            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((0, translator_1.shiftState)(state, code, { needNamespace, rename, declaration: true }))}`;
             logicData.push({ description, code: tempCode });
-            if (moduleIndexList?.includes(logicIndex)) {
+            if (requiredIndexes?.includes(logicIndex)) {
                 code += (0, exports.getLogicStructures)(logic, 'extension', { description, codeStr: tempCode }, structureNamespace);
             }
             else {
@@ -412,7 +412,7 @@ const getCurrentNodeContext = (currentNode, focusedNodePath) => {
     return { code: (0, exports.genTsBlock)(code), currentLogic: code };
 };
 exports.getCurrentNodeContext = getCurrentNodeContext;
-function genNaturalTSContext(app, currentNode, focusedNodePath, moduleIndexList) {
+function genNaturalTSContext(app, currentNode, focusedNodePath, requiredIndexes) {
     const frontend = currentNode?.getAncestor('Frontend');
     const logicType = currentNode?.parentNode?.concept === 'App' ? 'global_logic' : 'view_logic';
     const state = (0, translator_1.createCompilerState)();
@@ -431,22 +431,22 @@ function genNaturalTSContext(app, currentNode, focusedNodePath, moduleIndexList)
     }
     code += '\n### [5]全局上下文\n';
     code += '\n#### [5-0]枚举\n';
-    code += (0, exports.getEnums)(app, state, moduleIndexList).code;
+    code += (0, exports.getEnums)(app, state, requiredIndexes).code;
     code += '\n#### [5-1]实体\n';
-    code += (0, exports.getEntities)(app, state, moduleIndexList).code;
+    code += (0, exports.getEntities)(app, state, requiredIndexes).code;
     code += '\n#### [5-2]可用的数据结构\n';
-    code += (0, exports.getStructures)(app, state, moduleIndexList).code;
+    code += (0, exports.getStructures)(app, state, requiredIndexes).code;
     code += '\n### [6]服务端逻辑\n';
-    code += (0, exports.getLogics)(app, currentNode, moduleIndexList).code;
+    code += (0, exports.getLogics)(app, currentNode, requiredIndexes).code;
     code += '\n### [7]可调用的接口列表\n';
-    code += (0, exports.getModuleInterfaces)(app, state, moduleIndexList).code;
+    code += (0, exports.getModuleInterfaces)(app, state, requiredIndexes).code;
     if (app?.connections?.length > 0 && logicType === 'global_logic') {
         code += '\n### [8]连接器逻辑列表\n';
-        code += (0, exports.getConnectors)(app, state, moduleIndexList).code;
+        code += (0, exports.getConnectors)(app, state, requiredIndexes).code;
     }
     if (app?.dependencies?.length > 0) {
         code += '\n### [9]依赖库逻辑列表\n';
-        code += (0, exports.getDependencies)(app, state, moduleIndexList).code;
+        code += (0, exports.getDependencies)(app, state, requiredIndexes).code;
     }
     if (frontend) {
         code += '\n### [10]页面上下文\n';

package/out/natural/prompt/analyzeClaims.js

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

package/out/natural/prompt/analyzeClaims.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyzeClaims.js","sourceRoot":"","sources":["../../../src/natural/prompt/analyzeClaims.ts"],"names":[],"mappings":";;;AAAO,MAAM,aAAa,GAAG,CAAC,MAAW,EAAE,EAAE;IAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC7B,MAAM,MAAM,GAAG;;;;;;;;;CAShB,CAAC;IACA,qDAAqD;IACrD,MAAM,SAAS,GAAG;QAChB,YAAY,EAAE;;;;;;;;;;;CAWjB;KACS,CAAC;IACT,OAAO,SAAS,EAAE,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC;AAC1C,CAAC,CAAC;AA5BW,QAAA,aAAa,iBA4BxB"}
+{"version":3,"file":"analyzeClaims.js","sourceRoot":"","sources":["../../../src/natural/prompt/analyzeClaims.ts"],"names":[],"mappings":";;;AAAO,MAAM,aAAa,GAAG,CAAC,MAAW,EAAE,EAAE;IAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC7B,MAAM,MAAM,GAAG;;;;;;;;;;CAUhB,CAAC;IACA,qDAAqD;IACrD,MAAM,SAAS,GAAG;QAChB,YAAY,EAAE;;;;;;;;;;;;CAYjB;KACS,CAAC;IACT,OAAO,SAAS,EAAE,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC;AAC1C,CAAC,CAAC;AA9BW,QAAA,aAAa,iBA8BxB"}

package/out/natural/prompt/analyzeFormatOutput.js

@@ -9,7 +9,7 @@ const analyzeFormatOutput = () => {
       "plan": ["plans"],
       "text": "question",
       "executable": boolean,
-      "moduleIndexList": [index],
+      "requiredIndexes": [index],
       "needQueryRepository": boolean
   }
 }

package/out/natural/prompt/analyzeTasks.js

@@ -10,9 +10,9 @@ const analyzeTasks = () => {
 - text: 如果你认为需求不够明确时，可以继续询问用户需求的细节，不可为空
 - executable
   - 类型为 boolean, 如果你认为需求比较明确并且 plan 可执行, 返回 true, 否则返回 false
-- moduleIndexList
+- requiredIndexes
   - 类型为 Array, 你需要根据用户的执行计划，从 Context Definition 中整理出执行需要用到的模块或者方法，返回对应的索引
-  - 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引。例如："moduleIndexList": ['1','6-3','8-1-1-0']。
+  - 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引。例如："requiredIndexes": ['1','6-3','8-1-1-0']。
 - needQueryRepository
   - 类型为 boolean, 如果你认为需求相关的上下文信息不足，需要另外查询知识库时, 返回 true, 否则返回 false
 `;

package/out/server/naslServer.js

@@ -395,7 +395,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         yield* getTsFiles(processes, 'process');
         if (module instanceof concepts_1.Connector) {
             yield* getTsFiles(triggerLaunchers, 'triggerLauncher');
-            yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface');
+            // yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface');
             yield* getTsFiles(concat(namespaces, 'logics'), 'namespaces_logic');
         }
         if (module instanceof concepts_1.App) {
@@ -1950,7 +1950,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         else if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.OverriddenLogic) {
             const { isRefedByTrigger, fRefNames } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
-            if (fileNode instanceof concepts_1.Logic && fileNode?.exportInterface) {
+            if (fileNode instanceof concepts_1.Logic && fileNode?.exportInterface && fileNode.calleewholeKey.startsWith('app.logics')) {
                 let isSame = true;
                 const itf = fileNode.exportInterface;
                 const { params: logicParams, returns: logicReturns } = fileNode;
@@ -1979,7 +1979,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     if (logicReturns[0].name !== itfReturns[0].name) {
                         isSame = false;
                     }
-                    else if (!logicReturns[0]?.typeAnnotation?.isSame?.(itfReturns[0]?.typeAnnotation)) {
+                    else if (!(logicReturns[0]?.typeAnnotation ?? logicReturns[0]?.__TypeAnnotation)?.isSame?.(itfReturns[0]?.typeAnnotation)) {
                         isSame = false;
                     }
                 }
@@ -4173,6 +4173,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
         const json = app.toJSON();
         this.logger.timeEnd('全量标注');
+        // 测试环境打印数据
+        if (utils.isTestBrowser) {
+            this.logger.info('全量标注数据', json);
+        }
         if (releaseFlag) {
             // 全量标注后对json进行一些修改，为了服务端翻译处理
             this.annotationToJson(typesMap, json);
@@ -4466,7 +4470,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @param result toTs生成的内容
      */
     async handleDelete(fileNode, targetNode, result) {
-        const filePath = fileNode.getEmbeddedFilePath();
+        const filePath = fileNode?.getEmbeddedFilePath();
+        if (!filePath) {
+            return;
+        }
         // 如果要删除，而且当前要删Logic就直接删除并且清除错误
         /**
          * 删除节点中的一个内容,删除了以后，就查一下引用的地方一起查一下异常