@lcap/nasl 3.3.0-alpha.1 → 3.3.0-alpha.3

package/src/concepts/BindEvent__.ts

@@ -1,25 +1,26 @@
-import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
-import ViewElement, { ElementToVueOptions } from './ViewElement__';
+import { ElementToVueOptions } from './ViewElement__';
 import { elementsEventsMap } from '../server/createUiTs';
 import Param from './Param__';
 import TypeAnnotation from './TypeAnnotation__';
 import Process from './Process__';
 
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import Logic from './Logic__';
 import Argument from './Argument__';
+import ViewElement from './ViewElement__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
@@ -72,28 +73,24 @@ export class BindEvent extends BaseNode {
   get element() {
     return this.getAncestor('ViewElement') as ViewElement;
   }
-
   /**
    * 祖先 View
    */
   get view() {
     return this.getAncestor('View') as View;
   }
-
   /**
    * 祖先 Module
    */
   get module() {
     return this.getAncestor('Module') as Module;
   }
-
   /**
    * 祖先 App
    */
   get app() {
     return this.getAncestor('App') as App;
   }
-
   /**
    * 祖先 Frontend
    */
@@ -105,12 +102,10 @@ export class BindEvent extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<BindEvent>) {
-    // @ts-ignore
-    source = { ...BindEvent.getDefaultOptions(), ...source };
+    source = Object.assign({}, BindEvent.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
-
   getClassName() {
     return 'BindEvent';
   }
@@ -130,7 +125,6 @@ export class BindEvent extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置元素绑定事件名称
    */
@@ -172,7 +166,6 @@ export class BindEvent extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
-
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, true);
   }
@@ -439,7 +432,7 @@ export class BindEvent extends BaseNode {
     if (typeof options === 'string') {
       logic = (this.logics as Logic[]).find((item) => item.name === options);
       if (!logic) {
-        throw new Error(`找不到逻辑 ${options}`);
+        throw new Error('找不到逻辑 ' + options);
       }
     } else {
       logic = options;
@@ -448,7 +441,7 @@ export class BindEvent extends BaseNode {
   }
 
   __removeLogic(logic: Logic) {
-    const { parentKey } = logic;
+    const parentKey = logic.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -482,7 +475,7 @@ export class BindEvent extends BaseNode {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -504,10 +497,10 @@ export class BindEvent extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   get process() {
     return this.getAncestor('Process') as Process;
   }
@@ -523,32 +516,30 @@ export class BindEvent extends BaseNode {
   }
 
   get calleeKey(): string {
-    const { tsCalleeNamespace } = this;
+    const tsCalleeNamespace = this.tsCalleeNamespace;
     if (!tsCalleeNamespace) {
       return `${this.calleeName}`;
     }
     // elements单独处理相对路径，和后缀的问题
     if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
       const methodName = tsCalleeNamespace.substring(0, tsCalleeNamespace.length - '.logics'.length);
-      return `__${methodName}.${this.calleeName}`;
+      return '__' + methodName + `.${this.calleeName}`;
     }
     return `${tsCalleeNamespace}.${this.calleeName}`;
   }
-
   // 用于展示的value
   get randerValue() {
     const randerNameSpace = this.tsCalleeNamespace;
     if (!randerNameSpace) {
-      return `${this.calleeName}`;
+      return '' + this.calleeName;
     }
     // elements单独处理相对路径，和后缀的问题
     if (randerNameSpace.startsWith('elements') && randerNameSpace.endsWith('logics')) {
       const methodName = randerNameSpace.substring('elements.'.length, randerNameSpace.length);
-      return `$refs.${methodName}.${this.calleeName}`;
+      return '$refs.' + methodName + `.${this.calleeName}`;
     }
     return `${randerNameSpace}.${this.calleeName}`;
   }
-
   // 绑定事件转驼峰
   toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
 
@@ -582,7 +573,7 @@ export class BindEvent extends BaseNode {
           if (logic.view) {
             const logicName = logic.name;
             if ((logic.parentNode as BindEvent)?.element) {
-              logic.name = `__${logic.view.name}${(logic.parentNode as BindEvent).element.name}${logic.name}`;
+              logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
             }
 
             logic.name = logic.name.replace(/-/g, '');
@@ -642,7 +633,7 @@ export class BindEvent extends BaseNode {
       if (logic.view) {
         const logicName = logic.name;
         if ((logic.parentNode as BindEvent)?.element) {
-          logic.name = `__${logic.view.name}${(logic.parentNode as BindEvent).element.name}${logic.name}`;
+          logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
         }
 
         logic.name = logic.name.replace(/-/g, '');
@@ -675,7 +666,7 @@ export class BindEvent extends BaseNode {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState, isPageCycle?: Boolean): string {
+  toNaturalTS(state = createCompilerState(), isPageCycle?: Boolean): string {
     // 如果有绑定的事件名
     let code = ``;
     if (isPageCycle) {
@@ -762,6 +753,7 @@ export class BindEvent extends BaseNode {
         } else if (ref.includes('basicTypes')) {
           // 不要删除，用于转换类型
           type = ref.replace('#/basicTypes/', 'nasl.core.');
+          type = type.replace('Integer', 'Long');
         }
         code = `${type}`;
       }
@@ -810,10 +802,8 @@ export class BindEvent extends BaseNode {
         arr.push(parentName);
       }
       return `${arr.join('.')}.${ns || 'bindEvent'}`;
-    }
-    throw new Error('无法获取命名空间，请设置 parentNode！');
+    } else throw new Error('无法获取命名空间，请设置 parentNode！');
   }
-
   /**
    * 转换成 Vue 的模板格式
    */
@@ -827,7 +817,7 @@ export class BindEvent extends BaseNode {
         let index = 0;
         while (parent && parent.concept !== 'View') {
           if ((parent as ViewElement).slotScope) {
-            argsList.unshift(index === 0 ? 'current' : `current${index}`);
+            argsList.unshift(index === 0 ? 'current' : 'current' + index);
             index++;
           }
           parent = parent.parentNode;
@@ -857,7 +847,7 @@ export class BindEvent extends BaseNode {
       let index = 0;
       while (parent && parent.concept !== 'View') {
         if ((parent as ViewElement).slotScope) {
-          argsList.unshift(index === 0 ? 'current' : `current${index}`);
+          argsList.unshift(index === 0 ? 'current' : 'current' + index);
           index++;
         }
         parent = parent.parentNode;
@@ -870,7 +860,7 @@ export class BindEvent extends BaseNode {
   // 获取bindEvent上的logic的参数从上文获取
   getContextRenderLogicParams(logic: Logic) {
     const argsList: Param[] = [];
-    const { virtualParams } = logic;
+    const virtualParams = logic.virtualParams;
     if (this.logics?.length) {
       let parent = this.parentNode;
       let index = 0;
@@ -878,7 +868,7 @@ export class BindEvent extends BaseNode {
       argsList.push(event);
       while (parent && parent.concept !== 'View') {
         if ((parent as ViewElement).slotScope) {
-          const param = Param.from({ name: index === 0 ? 'current' : `current${index}`, typeAnnotation: null }, logic, 'virtualParams');
+          const param = Param.from({ name: index === 0 ? 'current' : 'current' + index, typeAnnotation: null }, logic, 'virtualParams');
           argsList.push(param);
           index++;
         }
@@ -918,9 +908,8 @@ export class BindEvent extends BaseNode {
 
       const cap = suffixRE.exec(event?.title);
       if (cap) return `${event.title.replace(suffixRE, '')}“${parent.title || parent.name}”页面${cap[0]}`;
-      return `${event.title}“${parent.title || parent.name}”页面`;
-    }
-    if (parent instanceof ViewElement) {
+      else return `${event.title}“${parent.title || parent.name}”页面`;
+    } else if (parent instanceof ViewElement) {
       const eventName = `${parent.tag}-${this.name}`;
       if (elementsEventsMap[eventName]) {
         const event = elementsEventsMap[eventName];
@@ -937,9 +926,8 @@ export class BindEvent extends BaseNode {
 
         const cap = suffixRE.exec(event?.title);
         if (cap) return `${event.title.replace(suffixRE, '')}${title ? `“${title}”` : ''}${parent.name}${cap[0]}`;
-        return `${event.title}${title ? `“${title}”` : ''}${parent.name}`;
-      }
-      if (['click', 'dblclick', 'contextmenu', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'focus', 'blur'].includes(this.name)) {
+        else return `${event.title}${title ? `“${title}”` : ''}${parent.name}`;
+      } else if (['click', 'dblclick', 'contextmenu', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'focus', 'blur'].includes(this.name)) {
         const event = elementsEventsMap[this.name];
 
         let title = '';
@@ -954,7 +942,7 @@ export class BindEvent extends BaseNode {
 
         const cap = suffixRE.exec(event?.title);
         if (cap) return `${event.title.replace(suffixRE, '')}${title ? `“${title}”` : ''}${parent.name}${cap[0]}`;
-        return `${event.title}${title ? `“${title}”` : ''}${parent.name}`;
+        else return `${event.title}${title ? `“${title}”` : ''}${parent.name}`;
       }
       return `${parent.name}-${this.name}`;
     }
@@ -965,37 +953,33 @@ export class BindEvent extends BaseNode {
     if (parent instanceof View) {
       const event = elementsEventsMap[this.name];
       return `${event.title}`;
-    }
-    if (parent instanceof ViewElement) {
+    } else if (parent instanceof ViewElement) {
       const eventName = `${parent.tag}-${this.name}`;
       if (elementsEventsMap[eventName]) {
         const event = elementsEventsMap[eventName];
         return `${event.title}`;
-      }
-      if (['click', 'dblclick', 'contextmenu', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'focus', 'blur'].includes(this.name)) {
+      } else if (['click', 'dblclick', 'contextmenu', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'focus', 'blur'].includes(this.name)) {
         const event = elementsEventsMap[this.name];
         return `${event.title}`;
       }
       return `${this.name}`;
     }
   }
-
   getViewEventName() {
     // 名称规则：组件的名称 + 组件的事件 + 逻辑本身的事件 用下划线链接
-    const { parentNode } = this;
+    const parentNode = this.parentNode;
     const newName = this.name.replace(/-/g, '');
     if (parentNode instanceof ViewElement) {
       return `${parentNode.name}_${newName}`;
-    }
-    if (parentNode instanceof View) {
+    } else if (parentNode instanceof View) {
       return `${this.view.name}_${newName}`;
+    } else {
+      // 这里编译成这个名字了 后续pctemplate 里也得按这个调用？
+      // 或者说因为会编译在不同的端里  直接 name好了
+      // return `${this.parentNode.name}_${newName}`;
+      return newName;
     }
-    // 这里编译成这个名字了 后续pctemplate 里也得按这个调用？
-    // 或者说因为会编译在不同的端里  直接 name好了
-    // return `${this.parentNode.name}_${newName}`;
-    return newName;
   }
-
   toFunction(state?: TranslatorState): string {
     // shiftState(state, code)
     // 和 toJS一样的 只是下一行增加了 function 关键字
@@ -1011,7 +995,6 @@ export class BindEvent extends BaseNode {
     code += '}\n';
     return code;
   }
-
   getTsNamespace() {
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
@@ -1022,10 +1005,8 @@ export class BindEvent extends BaseNode {
         arr.push(parentName);
       }
       return `${arr.join('.')}.bindEvents`;
-    }
-    throw new Error('无法获取命名空间，请设置 parentNode！');
+    } else throw new Error('无法获取命名空间，请设置 parentNode！');
   }
-
   toEmbeddedTSFile() {
     let code = `namespace ${this.getTsNamespace()} {\n`;
     const state = createCompilerState(code, {
@@ -1047,7 +1028,6 @@ export class BindEvent extends BaseNode {
       sourceMap: state.sourceMap,
     };
   }
-
   /**
    * 生成宿主语言的文件路径
    * @param name 一般不用传，用于 rename
@@ -1057,22 +1037,22 @@ export class BindEvent extends BaseNode {
     let parent = this.parentNode;
     if (parent) {
       while (parent && parent instanceof View) {
-        pathName = `${parent.name}/${pathName}`;
+        pathName = parent.name + '/' + pathName;
         parent = parent.parentNode;
       }
     }
     return `/embedded/${this.app.name}/frontends/${this.frontend.name}/bindEvents/${pathName}.ts`;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
 classMap.BindEvent = BindEvent;
 export default BindEvent;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/BindStyle__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import ViewElement, { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 //= ===============================================================================
@@ -480,7 +480,7 @@ export class BindStyle extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '()=>{';
     if (this.expression) {
       code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));

package/src/concepts/BooleanLiteral__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 //= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -69,7 +69,7 @@ export class BooleanLiteral extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState) {
+  toEmbeddedTS(state = createCompilerState()) {
     return `new nasl.core.Boolean(${this.value})`;
   }
 

package/src/concepts/CallAuthInterface__.ts

@@ -1,6 +1,6 @@
 import { v4 as uuidv4 } from 'uuid';
 import Param from './Param__';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { getNodeByNodeCallee } from '../automate/engine/utils.js';
 import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
 import LogicItem from './LogicItem__';
@@ -330,7 +330,7 @@ export class CallAuthInterface extends CallInterface {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = this.tsAuthLogicKey;
     // 目前没有任何其他范型，故这里先支持默认俩范型
     // FIXME

package/src/concepts/CallConnector__.ts

@@ -6,7 +6,7 @@ import Argument from './Argument__';
 import Identifier from './Identifier__';
 import TypeAnnotation from './TypeAnnotation__';
 import Connection from './Connection__';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 
 //= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -190,7 +190,7 @@ export class CallConnector extends CallLogic {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     if (this.handleError) {
       code += 'nasl.util.autoHandleError(';

package/src/concepts/CallFunction__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import Identifier from './Identifier__';
@@ -558,7 +558,7 @@ export class CallFunction extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     const { calleeKey } = this;
     if (['nasl.util.Convert', 'nasl.util.FromString'].includes(calleeKey)) {
@@ -596,7 +596,7 @@ export class CallFunction extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     let code = '';
     code = this.calleeKey;
     if (Array.isArray(this.typeArguments) && this.typeArguments.length) {

package/src/concepts/CallInterface__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import Interface from './Interface__';
 import NullLiteral from './NullLiteral__';
 import { ElementToVueOptions } from './ViewElement__';
@@ -402,7 +402,7 @@ export class CallInterface extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const { completeArguments, parentNode, parentKey, tsCalleeKey } = this;
 
     let code = `${tsCalleeKey}(`;
@@ -437,7 +437,7 @@ export class CallInterface extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     const { completeArguments, parentNode, parentKey, tsCalleeKey } = this;
 
     let code = `${tsCalleeKey}(`;

package/src/concepts/CallLogic__.ts

@@ -1,10 +1,10 @@
 import * as JSON5 from 'json5';
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import Logic from './Logic__';
 import Param from './Param__';
 import View from './View__';
-import { ElementToVueOptions } from './ViewElement__';
+import ViewElement, { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import { findConceptKeyWordIndexFromNamespace } from '../utils';
 import { config } from '../config';
@@ -702,14 +702,64 @@ export class CallLogic extends LogicItem {
     ) {
       code += '$global.';
     }
-    code += this.calleeName;
-    code += '(';
-    const { completeArguments } = this;
-    completeArguments.forEach((arg, index) => {
-      code += arg?.toVue(options);
-      if (index !== completeArguments.length - 1) code += ', ';
-    });
-    code += ')';
+    const completeArguments = this.completeArguments;
+    if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
+        const currentElement = this.getAncestor('ViewElement') as ViewElement
+        code += '(params) => {\n'
+        code += `this['__${currentElement.name}_params'] = {...params};\n`
+        code += `return this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName}']`
+        code += `({
+            config: {
+                download: false,
+            },
+            query: {},`;
+        code += `
+            headers: {
+                "lcap-calllogic-uuid": "${this.uuid}",
+            },
+        `;
+        code += `path: {},
+        body: {`;
+        const logic = getNodeByNodeCallee(this.app, this.calleewholeKey, (key: string, tempPoint: any) => {
+            // 处理 NASL 中未定义的假的节点
+            if (key === tempPoint?.name) {
+                return {
+                    tempPoint,
+                    state: 1,
+                };
+            }
+            const t = tempPoint?.[key];
+            return {
+                tempPoint: t,
+                state: Array.isArray(t) ? 2 : 1,
+            };
+        });
+        const args = logic?.params || [];
+        const argsStr = args
+            .map((arg: any, index: number) => {
+                const actualArg = completeArguments[index];
+                return {
+                    keyword: arg?.name,
+                    arg: actualArg,
+                };
+            })
+            .map((obj: any) => `\n${obj?.keyword}: ${obj?.arg?.toVue(options)}`)
+            .join(', ');
+        code += argsStr;
+        if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+            code += `,\n__typeArguments: ${JSON5.stringify(this.typeArguments)}`;
+        }
+        code += '\n}';
+        code += '}';
+    } else {
+      code += this.calleeName;
+      code += '(';
+      completeArguments.forEach((arg, index) => {
+        code += arg?.toVue(options);
+        if (index !== completeArguments.length - 1) code += ', ';
+      });
+    }
+    code += ')}';
     return code;
   }
 
@@ -739,6 +789,9 @@ export class CallLogic extends LogicItem {
       });
     }
     code += ')';
+    if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
+      return this.calleeName
+    }
 
     return code;
   }
@@ -1092,7 +1145,7 @@ export class CallLogic extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
 
     const {
@@ -1136,6 +1189,9 @@ export class CallLogic extends LogicItem {
         });
         code += ')';
       } else if (completeArguments.length) {
+        if (['expression'].includes(parentKey) && this.getAncestor('BindAttribute')?.name === 'data-source' && (state as any)?.noNeedParams) {
+          return
+        }
         code += '(';
         completeArguments.forEach((arg, index) => {
           // 取到是不是必填放入参数中
@@ -1152,7 +1208,7 @@ export class CallLogic extends LogicItem {
     const setEndSemi = () => {
       const { concept: parentConcept } = parentNode ?? {};
       if (
-        !['test', 'patterns', 'returnExpression'].includes(parentKey) &&
+        !['test', 'patterns', 'returnExpression', 'expression'].includes(parentKey) &&
         ![
           'Argument',
           'Assignment',
@@ -1211,7 +1267,7 @@ export class CallLogic extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     const {
       handleError,
       calleeKey,

package/src/concepts/CallQueryComponent__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import QueryJoinExpression from './QueryJoinExpression__';
 import Entity from './Entity__';
 import Structure from './Structure__';
@@ -953,7 +953,7 @@ export class CallQueryComponent extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     if (!this.typeAnnotation)
       return `(function () {
                 return;

package/src/concepts/Comment__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, withSourceMap, indent } from '../translator';
+import { TranslatorState, withSourceMap, indent, createCompilerState } from '../translator';
 //= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -75,7 +75,7 @@ export class Comment extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += `\n${indent(state?.tabSize || 0)}
         /**