@lcap/nasl 3.6.0-alpha.4 → 3.6.0-alpha.6

package/src/concepts/App__.ts

@@ -3984,11 +3984,21 @@ export class App extends BaseNode {
     path.forEach((key, index) => {
       if (index === path.length - 1) {
         if (compose?.[key]?.nodes) {
+          // 需要判断下nodes里面是否已经存在
           if (Array.isArray(node)) {
-            compose[key].nodes.push(...node);
+            node.forEach((item) => {
+              if (!compose[key].nodes.find((it) => it === item)) {
+                compose[key].nodes.push(item);
+              }
+            });
           } else {
-            compose[key].nodes.push(node);
+            if (!compose[key].nodes.find((it) => it === node)) {
+              compose[key].nodes.push(node);
+            }
           }
+          // 去重
+          compose[key].nodes = Array.from(new Set(compose[key].nodes));
+
         } else {
           if (!compose?.[key]) {
             compose[key] = {};
@@ -4018,9 +4028,20 @@ export class App extends BaseNode {
             delNodes(_compose[key]);
           }
         }
-        _compose.nodes.forEach((node) => {
-          node.delete();
+        const arr = [..._compose.nodes] || [];
+        const triggerNode: BaseNode[] = []; // 触点放在最后删
+        arr.forEach((node) => {
+          if (node.name === path?.[0]) {
+            triggerNode.push(node);
+          } else {
+            node && node.delete();
+          }
+        });
+
+        triggerNode.forEach((node) => {
+          node && node.delete();
         })
+
         _compose.nodes = [];
       }
     }
@@ -4081,6 +4102,42 @@ export class App extends BaseNode {
     this.emit('collect:end');
   }
 
+  /**
+   * 删除分组内的某一个
+   */
+  deleteComposeNode(path: string[], node: BaseNode) {
+    if (!node) return;
+    let compose = this.composeCache;
+    path.forEach((key, index) => {
+      if (index === path.length - 1) {
+        if (compose?.[key]?.nodes) {
+          const index = compose[key].nodes.findIndex((it) => it === node);
+          if (index > -1) {
+            compose[key].nodes.splice(index, 1);
+          }
+        }
+      } else {
+        compose = compose[key];
+      }
+    });
+  }
+
+  /**
+   * 清空某一分组
+   */
+  clearComposeNodes(path: string[]) {
+    let compose = this.composeCache;
+    path.forEach((key, index) => {
+      if (index === path.length - 1) {
+        if (compose?.[key]) {
+          delete compose[key];
+        }
+      } else {
+        compose = compose[key];
+      }
+    });
+  }
+
   /**
    * 获取命名空间
    */

package/src/concepts/BinaryExpression__.ts

@@ -27,6 +27,23 @@ const operatorMap = {
   '>=': 'greaterThanOrEqual',
   '<=': 'lessThanOrEqual',
 };
+const joinOperatorMap = {
+  '&&': 'and',
+  '||': 'or',
+  '+': 'add',
+  '-': 'minus',
+  '*': 'multiply',
+  '/': 'divide',
+  '%': 'remainder',
+  // '==': 'equal',
+  // '!=': 'notEqual',
+  '==': 'isEqual',
+  '!=': 'isNotEqual',
+  '>': 'joinGreaterThan', // join
+  '<': 'joinLessThan', // join
+  '>=': 'joinGreaterThanOrEqual', // join
+  '<=': 'joinLessThanOrEqual', // join
+};
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -418,7 +435,12 @@ export class BinaryExpression extends LogicItem {
     }
     if (['&&', '||', '+', '-', '*', '/', '%', '==', '!=', '>', '<', '>=', '<='].includes(self.operator)) {
       let code = '';
-      code += `nasl.core.${operatorMap[self.operator as keyof typeof operatorMap]}(`;
+      // 数据查询的join支持特殊类型对比（枚举类型）
+      if (self.parentNode?.concept === 'QueryJoinExpression') {
+        code += `nasl.core.${joinOperatorMap[self.operator as keyof typeof operatorMap]}(`;
+      } else {
+        code += `nasl.core.${operatorMap[self.operator as keyof typeof operatorMap]}(`;
+      }
       code += self.left?.toEmbeddedTS
         ? yield* self.left.toEmbeddedTS(shiftState(state, code, { inline: true }))
         : '__LEFT__';

package/src/concepts/CallLogic__.ts

@@ -1335,7 +1335,7 @@ export class CallLogic extends LogicItem {
         code += ';';
       }
     };
-    if (useIife) {
+    if (!state.callLogicNoIife && useIife) {
       code += '(() =>{\nconst wrapper = ';
       if (handleError) {
         code += 'nasl.util.autoHandleError(';

package/src/concepts/FrontendType__.ts

@@ -769,6 +769,7 @@ export class FrontendType extends BaseNode {
     let code = `export namespace ${self.name} {\n`;
     code += 'const name = ';
     code += `"${self.name}";\n`;
+    code += 'export namespace businessComponents { }\n';
     code += '}\n';
     return code;
   }

package/src/concepts/Interface__.ts

@@ -1062,6 +1062,7 @@ export class Interface extends ImportedInterface {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.name}.interfaces`;
       return `extensions.${this.parentNode.name}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
@@ -1081,6 +1082,7 @@ export class Interface extends ImportedInterface {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.tsName}.interfaces`;
       return `extensions.${this.parentNode.tsName}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {

package/src/concepts/Logic__.ts

@@ -2109,6 +2109,8 @@ ${indent(state.tabSize)} */\n`;
         logicName = `viewLogic_${name}`;
       } else if (parentNode?.concept === 'BindEvent') {
         logicName = `on_${parentNode?.parentNode?.name}_${name}`;
+      } else if (this?.concept === 'BusinessLogic') {
+        logicName = `businessLogic_${name}`;
       } else {
         logicName = this.name;
       }

package/src/concepts/Paginate__.ts

@@ -1,4 +1,5 @@
-import { shiftState, withSourceMapGenerator, TranslatorGenerator, createCompilerState } from '../translator';
+import { shiftState, withSourceMapGenerator, TranslatorGenerator, createCompilerState, withSourceMap } from '../translator';
+import { getCallExpressionQuickInfo, Range, GetCode } from './utils/quick-info';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -287,22 +288,42 @@ export class Paginate extends LogicItem {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    const self = this;
+    let code = 'PaginateLimit(';
+    const list = self.list ? self.list.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += list;
+    code += ', ';
+    const page = self.page ? self.page.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += page;
+    code += ', ';
+    const size = self.size ? self.size.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += size;
+    code += `)\n`;
+    return code;
+  }
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     let code = 'nasl.util.paginateLimit(';
     const list = self.list ? yield* self.list.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';
     code += list;
-    code += ', ';
+    code += ',\n';
     const page = self.page ? yield* self.page.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';
     code += page;
-    code += ', ';
+    code += ',\n';
     const size = self.size ? yield* self.size.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';
     code += size;
     code += `)\n`;
     return code;
   }
 
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getCallExpressionQuickInfo(range, getCode);
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Structure__.ts

@@ -653,6 +653,7 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.name}.structures`;
       return `extensions.${this.parentNode.name}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
@@ -672,6 +673,7 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.tsName}.structures`;
       return `extensions.${this.parentNode.tsName}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {

package/src/concepts/ViewElement__.ts

@@ -1756,8 +1756,9 @@ export class ViewElement extends BaseNode {
           tabSize: 4,
           inline: true,
           noNeedParams: true,
+          callLogicNoIife: true,
         };
-        let value = yield* attr.expression.toEmbeddedTS(
+        const value = yield* attr.expression.toEmbeddedTS(
           shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
         );
         code += indent((state?.tabSize || 0) + 3);
@@ -1853,8 +1854,9 @@ export class ViewElement extends BaseNode {
               tabSize: 4,
               inline: true,
               noNeedParams: true,
+              callLogicNoIife: true,
             };
-            let value = yield* attr.expression.toEmbeddedTS(
+            const value = yield* attr.expression.toEmbeddedTS(
               shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
             );
             code += `type ${datasourceName} = `;

package/src/concepts/View__.ts

@@ -2897,6 +2897,19 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     return code;
   }
 
+  /**
+   * 该视图是否有子页面容器
+   */
+  hasRouterView() {
+    let res = false;
+    utils.traverse((current: any) => {
+      if (current.node.tag === 'u-router-view' || current.node.tag === 'van-router-view') {
+        res = true;
+      }
+    }, { node: { children: this.elements } });
+    return res;
+  }
+
   getViewCallLogics(): string[] {
     const callbackLogics: string[] = [];
     this.traverseChildren((el) => {

package/src/concepts/basics/stdlib/nasl.auth.ts

@@ -66,30 +66,30 @@ export function initialize() {
         }),
       ],
     }),
-    new Structure({
-      name: 'LCAPUser',
-      properties: [
-        new StructureProperty({
-          name: 'userName',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
-        }),
-        new StructureProperty({
-          name: 'userId',
-          typeAnnotation: TypeAnnotation.createPrimitive('String'),
-        }),
-        new StructureProperty({
-          name: 'extendFiledMap',
-          typeAnnotation: TypeAnnotation.createGeneric('map', {
-            typeArguments: [
-              // TypeAnnotation.createPrimitive('String'),
-              // TypeAnnotation.createPrimitive('String'),
-              TypeAnnotation.createTypeParam('K'),
-              TypeAnnotation.createTypeParam('V'),
-            ],
-          }),
-        }),
-      ],
-    }),
+    // new Structure({
+    //   name: 'LCAPUser',
+    //   properties: [
+    //     new StructureProperty({
+    //       name: 'userName',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new StructureProperty({
+    //       name: 'userId',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new StructureProperty({
+    //       name: 'extendFiledMap',
+    //       typeAnnotation: TypeAnnotation.createGeneric('map', {
+    //         typeArguments: [
+    //           // TypeAnnotation.createPrimitive('String'),
+    //           // TypeAnnotation.createPrimitive('String'),
+    //           TypeAnnotation.createTypeParam('K'),
+    //           TypeAnnotation.createTypeParam('V'),
+    //         ],
+    //       }),
+    //     }),
+    //   ],
+    // }),
   );
 
   authTypeList.push(
@@ -105,12 +105,15 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
+      description: '检查当前用户是否有当前资源的权限',
       returns: [],
     }),
     new Logic({
       name: 'logout',
       params: [],
       returns: [],
+      description: '退出当前登录状态',
+
     }),
     new Logic({
       name: 'encryptByAES',
@@ -120,10 +123,14 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
+      description: '对字符串实现aes加密 返回加密后的字符串',
+
       returns: [],
     }),
     new Logic({
       name: 'decryptByAES',
+      description: '对字符串实现aes解密 返回解密后的字符串',
+
       params: [
         new Param({
           name: 'string',
@@ -132,34 +139,90 @@ export function initialize() {
       ],
       returns: [],
     }),
+    // new Logic({
+    //   name: 'getUserList',
+    //   params: [
+    //     new Param({
+    //       name: 'userNameFilter',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('String'),
+    //     }),
+    //     new Param({
+    //       name: 'limit',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //     new Param({
+    //       name: 'offset',
+    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+    //     }),
+    //   ],
+    //   returns: [
+    //     new Return({
+    //       name: 'result',
+    //       typeAnnotation: TypeAnnotation.createGeneric('List', {
+    //         typeArguments: [TypeAnnotation.createTypeParam('T')],
+    //       }),
+    //     }),
+    //   ],
+    // }),
     new Logic({
-      name: 'getUserList',
+      name: 'encryptPassword',
+      description: '密码加密（采用Bcrypt算法进行加密，salt默认10位）',
       params: [
         new Param({
-          name: 'userNameFilter',
+          name: 'password',
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+      ],
+      returns: [
+        new Return({
+          name: 'BcryptedHashPassword',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'validatePassword',
+      description: '密码校验（采用Bcrypt算法进行校验）',
+      params: [
         new Param({
-          name: 'limit',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+          name: 'plainText',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }), new Param({
+          name: 'hashedText',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+
+      ],
+      returns: [
+        new Return({
+          name: 'matchResult',
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'generateUserId',
+      description: '生成用户唯一标识（根据Md5算法）',
+      params: [
         new Param({
-          name: 'offset',
-          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+          name: 'userName',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }), new Param({
+          name: 'source',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
+
       ],
       returns: [
         new Return({
           name: 'result',
-          typeAnnotation: TypeAnnotation.createGeneric('List', {
-            typeArguments: [TypeAnnotation.createTypeParam('T')],
-          }),
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
     }),
     new Logic({
       name: 'getCurrentUser',
-      description: '获取当前登录用户信息，需在登录后调用',
+      description: '即将下线，请使用服务端全局变量currentUser',
       returns: [
         new Return({
           name: 'result',

package/src/enums/KEYWORDS.ts

@@ -14,6 +14,8 @@ export const KEYWORDS = [
   // 'authentication',
   'authorization',
   'await',
+  // 鉴权方式中在构建TS AST时需要用到
+  'api',
   'boolean',
   'break',
   'browser',

package/src/generator/genBundleFiles.ts

@@ -32,9 +32,11 @@ interface Config {
   tenantType: any;
   tenantLevel: any;
   appid: string;
+  isExport?:string;
   devDnsAddr: string;
   miniEnable: boolean;
   isPreviewFe?: boolean;
+  previewVersion?: string;
 }
 
 // 将metaData转成字符串
@@ -362,7 +364,8 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   if (frontend.globalScaleEnabled) {
     content += `{
             // 如果是顶层页面，才使用iframe缩放，否则会死循环
-            if(window.parent === window){
+            // 如果不是登录页面，才使用iframe缩放，否则会拒绝连接
+            if(window.parent === window && location.pathname !== '/login'){
                 // 顶层页面里有个iframe，用来缩放页面
                 document.body.innerHTML = '<iframe src="' + location.href + '"></iframe>';
                 const iframe = document.querySelector('iframe');
@@ -384,6 +387,8 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
                         marginRight = (scale - 1)/scale * 100 + '%';
                         // 由于 marginBottom 的百分比也是基于宽度的，因此需要乘以 windowHeight / windowWidth
                         marginBottom = (scale - 1)/scale * windowHeight / windowWidth * 100 + '%';
+                        // 消除白边，暂时没有找到原因，临时处理 bugid: 2765692131244288
+                        marginBottom = 'calc(' + marginBottom + ' - 10px)';
                     }
                     iframe.style.marginRight = marginRight;
                     iframe.style.marginBottom = marginBottom;
@@ -615,10 +620,20 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
          `;
     content += str;
   }
-  const baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
-  let bundleMinPath = `${baseUrl}/${config.isPreviewFe?'mockBundle':'bundle'}.${genHash(content)}.min.js`;
+  const getBundleFileName =()=>{
+    if(config.isPreviewFe && config.previewVersion){
+      return `mockBundle-${config.previewVersion}`
+    }else {
+      return 'bundle'
+    }
+  }
+  let baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
+  if((config.isExport)as any){
+      baseUrl = '';
+  }
+  let bundleMinPath = `${baseUrl}/${getBundleFileName()}.${genHash(content)}.min.js`;
   if (frontend.basePath) {
-    bundleMinPath = `${baseUrl}${frontend.basePath}/${config.isPreviewFe?'mockBundle':'bundle'}.${genHash(content)}.min.js`;
+    bundleMinPath = `${baseUrl}${frontend.basePath}/${getBundleFileName()}.${genHash(content)}.min.js`;
   }
   const otherJsList = (frontend as any)?.appletsConfig?.enable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
 

package/src/generator/permission.ts

@@ -178,7 +178,7 @@ async function findResourcesOfLogic(logic: Logic, uploaders: Map<string, ViewEle
   return optimizeResourceData(res);
 }
 
-function getAllLogics(app: App) {
+export function getAllLogics(app: App) {
   const modules: (Module | Connector)[] = [];
   const entities: Entity[] = [];
   const logics: Logic[] = [];

package/src/natural/genNaturalTS.ts

@@ -1,7 +1,7 @@
 import { App, View, Logic, BaseNode, Frontend } from '../concepts';
 import { shiftState, createCompilerState } from '../translator';
 
-import naslStdlibMap from './naslStdlibMap';
+import { getNaslStbMap } from './naslStdlibMap';
 
 export function genNaturalTS(app: App, currentNode?: BaseNode, focusedNodePath?: string) {
   const logic = currentNode as Logic;
@@ -14,7 +14,7 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode, focusedNod
   /* 标准库 */
   code += `\`\`\`ts\n`;
   code += '// 标准库\n';
-  code += `${Object.values(naslStdlibMap).join('\n')}\n`;
+  code += `${Object.values(getNaslStbMap(currentNode)).join('\n')}\n`;
   /* 全局上下文 */
   code += '\n// 全局上下文\n';
   app.enums.forEach((enumeration) => code += `${enumeration?.toNaturalTS()}\n`);

package/src/natural/index.ts

@@ -1,2 +1,5 @@
 export * from './genNaturalTS';
 export * from './transformTSCode';
+export * from './prompt/executeClaims';
+export * from './prompt/analyzeClaims';
+

package/src/natural/naslStdlibMap.ts

@@ -1,24 +1,30 @@
-let naslStdlibMap: any;
-/// #if process.env.BUILD_TARGET === 'node'
-if (globalThis.process) { // For TS build
+export const getNaslStbMap = (logic: any) => {
+  let naslStdlibMap: any;
+  const logicType = logic?.parentNode?.concept === 'App' ? 'global_logic' : 'view_logic';
+  /// #if process.env.BUILD_TARGET === 'node'
+  if (globalThis.process) { // For TS build
     const fs = require('fs');
     naslStdlibMap = {
-        'nasl.core.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.core.ts'), 'utf8'),
-        'nasl.util.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.util.ts'), 'utf8'),
-        'nasl.oql.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.oql.ts'), 'utf8'),
-        'nasl.ui.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.ui.ts'), 'utf8'),
+      'nasl.core.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.core.ts'), 'utf8'),
+      'nasl.util.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.util.ts'), 'utf8'),
+      'nasl.ui.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.ui.ts'), 'utf8'),
     };
-}
-/// #endif
-/// #if process.env.BUILD_TARGET !== 'node'
-if (globalThis.window) { // For TS build
+    if (logicType === 'global_logic') {
+      naslStdlibMap['nasl.oql.ts'] = fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.oql.ts'), 'utf8');
+    }
+  }
+  /// #endif
+  /// #if process.env.BUILD_TARGET !== 'node'
+  if (globalThis.window) { // For TS build
     naslStdlibMap = {
-        'nasl.core.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.core.ts').default,
-        'nasl.util.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.util.ts').default,
-        'nasl.oql.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.oql.ts').default,
-        'nasl.ui.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.ui.ts').default,
+      'nasl.core.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.core.ts').default,
+      'nasl.util.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.util.ts').default,
+      'nasl.ui.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.ui.ts').default,
     };
-}
-/// #endif
-
-export default naslStdlibMap;
+    if (logicType === 'global_logic') {
+      naslStdlibMap['nasl.oql.ts'] = require('!!raw-loader!../../sandbox-natural/stdlib/nasl.oql.ts').default;
+    }
+  }
+  /// #endif
+  return naslStdlibMap;
+};

package/src/natural/prompt/analyzeClaims.ts

@@ -0,0 +1,16 @@
+export const analyzeClaims = async (params: any) => {
+  const { logicType } = params;
+  const claims = `
+  - Knowledge 是你的知识库，你可以参考，但是你最终制定的计划中禁止包含方法或者函数名
+  - 如果用户没有特别指明是打印(日志/输出结果)，"输出结果"一律按照"返回输出结果"处理
+`;
+  // global_logic、view_logic、event_logic、business_Logic
+  const claimsMap = {
+    global_logic: `
+- Knowledge 是你的知识库，你可以参考，但是你最终制定的计划中禁止包含方法或者函数名
+- 如果用户没有特别指明是打印(日志/输出结果)，"输出结果"一律按照"返回输出结果"处理
+- 当前逻辑类型下暂不支持跳转页面功能，请提示用户: 如果需要跳转页面，请切换到前端页面逻辑或事件逻辑
+`
+  } as any;
+  return claimsMap?.[logicType] || claims;
+};