@lcap/nasl 3.3.3-beta.8 → 3.3.3-beta.9

package/out/utils/time-slicing/controller.js

@@ -195,8 +195,17 @@ class TimeSlicingController {
             };
             /** 异步运行标志 */
             let waitAsync = false;
-            const { group } = this;
+            const { group, id } = this;
             const isPromise = (input) => input && input instanceof Promise;
+            /** 运行结束 */
+            const runStop = (result) => {
+                this.clearState();
+                /// #if process.env.NODE_ENV === 'development'
+                this.displayInfo();
+                console.timeEnd(`时间分片-${id}`);
+                /// #endif
+                resolve(result);
+            };
             /** 运行帧 */
             const runFrame = () => {
                 this.setFrameStart();
@@ -225,12 +234,7 @@ class TimeSlicingController {
                 }
                 // 结束运行
                 if (result.done) {
-                    this.clearState();
-                    /// #if process.env.NODE_ENV === 'development'
-                    this.displayInfo();
-                    console.timeEnd(`时间分片-${this.id}`);
-                    /// #endif
-                    resolve(result.value);
+                    runStop(result.value);
                     return;
                 }
                 runNextGroup();
@@ -247,21 +251,29 @@ class TimeSlicingController {
             const runGroupTask = () => {
                 let taskId = 0;
                 while (!result.done && taskId < group.limit) {
-                    const lastIsPromise = isPromise(result.value);
-                    const lastParam = lastIsPromise ? this.async.result : result.value;
+                    const lastParam = isPromise(result.value) ? this.async.result : result.value;
                     taskId++;
                     result = generator.next(lastParam);
-                    // 运行完毕
-                    if (result.done || taskId >= group.limit) {
-                        break;
-                    }
                     // 返回 Promise 时，等待异步任务完成
                     if (isPromise(result.value)) {
-                        waitAsync = true;
-                        this.setAsyncStart();
-                        result.value
-                            .then(runAsyncTask)
-                            .catch(error => generator.throw(error));
+                        // 最后返回异步
+                        if (result.done) {
+                            result.value
+                                .then(runStop)
+                                .catch(error => generator.throw(error));
+                        }
+                        // 中途的异步流程
+                        else {
+                            waitAsync = true;
+                            this.setAsyncStart();
+                            result.value
+                                .then(runAsyncTask)
+                                .catch(error => generator.throw(error));
+                        }
+                        break;
+                    }
+                    // 运行完毕
+                    else if (result.done || taskId >= group.limit) {
                         break;
                     }
                 }
@@ -269,7 +281,7 @@ class TimeSlicingController {
                 group.limit = taskId;
             };
             /// #if process.env.NODE_ENV === 'development'
-            console.time(`时间分片-${this.id}`);
+            console.time(`时间分片-${id}`);
             /// #endif
             // 启动分片
             runFrame();

package/out/utils/time-slicing/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/controller.ts"],"names":[],"mappings":"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"}

package/out/utils/time-slicing/runner.d.ts

@@ -9,4 +9,4 @@ export declare function runGeneratorSync<T = void>(generator: Generator<any, T,
  *
  * @description 异步模式
  */
-export declare function runGeneratorAsync<T = void>(generator: Generator<any, T, any>): Promise<T>;
+export declare function runGeneratorAsync<T = void>(generator: Generator<any, T, any>): T extends Promise<any> ? T : Promise<T>;

package/out/utils/time-slicing/runner.js

@@ -36,15 +36,14 @@ function runGeneratorAsync(generator) {
             while (!result.done && !isPromise(result.value)) {
                 result = generator.next(result.value);
             }
-            if (result.done) {
-                resolve(result.value);
-                return;
-            }
             if (isPromise(result.value)) {
                 result.value
-                    .then(runAsync)
+                    .then(result.done ? resolve : runAsync)
                     .catch(error => generator.throw(error));
             }
+            else if (result.done) {
+                resolve(result.value);
+            }
         }
         run();
     });

package/out/utils/time-slicing/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/runner.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,SAAgB,gBAAgB,CAAW,SAAiC;IAC1E,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;QACnB,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KACvC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC;AAND,4CAMC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAW,SAAiC;IAC3E,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE;QAChC,IAAI,MAAM,GAA2B;YACnC,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,SAAS;SACjB,CAAC;QAEF,SAAS,SAAS,CAAC,KAAc;YAC/B,OAAO,KAAK,IAAI,KAAK,YAAY,OAAO,CAAC;QAC3C,CAAC;QAED,SAAS,QAAQ,CAAC,KAAc;YAC9B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,GAAG,EAAE,CAAC;QACR,CAAC;QAED,SAAS,GAAG;YACV,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC/C,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACvC;YAED,IAAI,MAAM,CAAC,IAAI,EAAE;gBACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtB,OAAO;aACR;YAED,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC3B,MAAM,CAAC,KAAK;qBACT,IAAI,CAAC,QAAQ,CAAC;qBACd,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC;QAED,GAAG,EAAE,CAAC;IACR,CAAC,CAAC,CAAC;AACL,CAAC;AAnCD,8CAmCC"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/runner.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,SAAgB,gBAAgB,CAAW,SAAiC;IAC1E,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;QACnB,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KACvC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC;AAND,4CAMC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAW,SAAiC;IAC3E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,MAAM,GAA2B;YACnC,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,SAAS;SACjB,CAAC;QAEF,SAAS,SAAS,CAAC,KAAc;YAC/B,OAAO,KAAK,IAAI,KAAK,YAAY,OAAO,CAAC;QAC3C,CAAC;QAED,SAAS,QAAQ,CAAC,KAAc;YAC9B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,GAAG,EAAE,CAAC;QACR,CAAC;QAED,SAAS,GAAG;YACV,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC/C,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACvC;YAED,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC3B,MAAM,CAAC,KAAK;qBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;qBACtC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aAC3C;iBACI,IAAI,MAAM,CAAC,IAAI,EAAE;gBACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACvB;QACH,CAAC;QAED,GAAG,EAAE,CAAC;IACR,CAAC,CAAQ,CAAC;AACZ,CAAC;AAjCD,8CAiCC"}

package/out/utils/time-slicing/tool.d.ts

@@ -21,4 +21,4 @@ export declare function timeSlicingWithList<T>(list: T[], cb: (val: T, index: nu
  * ```
  * @param {Generator<any, T, any>} generator - 生成器
  */
-export declare function timeSlicingWithGenerator<T = void>(generator: Generator<any, T, any>): Promise<T>;
+export declare function timeSlicingWithGenerator<T = void>(generator: Generator<any, T, any>): T extends Promise<any> ? T : Promise<T>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.3.3-beta.8",
+  "version": "3.3.3-beta.9",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "clear": "rimraf ./out",
@@ -74,4 +74,4 @@
     "typedoc": "0.22.17",
     "typescript": "4.7.4"
   }
-}
+}

package/sandbox/stdlib/nasl.util.ts

@@ -46,7 +46,7 @@ declare namespace nasl.util {
   export function ListFlatten<T>(list: nasl.collection.List<nasl.collection.List<T>>): nasl.collection.List<T>;
   export function ListTransform<T0, T>(list: nasl.collection.List<T0>, by: (elem: T0) => T): nasl.collection.List<T>;
   export function ListToMap<T, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.List<T>, byKey: (elem: T) => K, byVal: (elem: T) => V): nasl.collection.Map<K, V>;
-  export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
+  export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String | nasl.core.Enums>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
 
   export function ListSum<T extends nasl.core.Long | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
   export function ListProduct<T extends nasl.core.Long | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
@@ -131,7 +131,7 @@ declare namespace nasl.util {
   export function ListFindIndexAsync<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.core.Long;
   export function ListFilterAsync<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.collection.List<T>;
   export function ListDistinctByAsync<A, B>(list: nasl.collection.List<A>, by: (elem: A) => B): nasl.collection.List<A>;
-  export function ListGroupByAsync<A, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
+  export function ListGroupByAsync<A, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String | nasl.core.Enums>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
   export function ListTransformAsync<T0, T>(list: nasl.collection.List<T0>, by: (elem: T0) => T): nasl.collection.List<T>;
   export function MapFilterAsync<K, V>(map: nasl.collection.Map<K, V>, by: (key: K, value: V) => nasl.core.Boolean): nasl.collection.Map<K, V>;
   export function MapTransformAsync<K0, V0, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.Map<K0, V0>, byKey: (key: K0, value: V0) => K, byVal: (key: K0, value: V0) => V): nasl.collection.Map<K, V>;

package/src/bak/translator.js

@@ -1,6 +1,5 @@
 import { PAGE_COMPONENT_INCLUDE_TAG_MAP } from '..'
 import { attrConvertCamelCase } from '../utils/index'
-
 function safeCodeAsKey(name) {
   return `['${name}']`;
 }

package/src/breakpoint/generator/BreakpointNode.ts

@@ -349,6 +349,18 @@ export default class BreakpointNode extends BaseNode {
     return this.logic || this.variable;
   }
 
+  get items() {
+    return (this.node as any)?.items;
+  }
+
+  get concept() {
+    return (this.node as any)?.concept;
+  }
+
+  get getCallNode() {
+    return (this.node as any)?.getCallNode;
+  }
+
   init() {
     const source = this.logic || this.variable;
     const node = getRealNode(source);

package/src/breakpoint/generator/CallbackNode.ts

@@ -1,5 +1,17 @@
 import BreakpointNode from './BreakpointNode';
 
+const isFunctional = (node: any): boolean => {
+  try {
+    const a = node?.toJS && node?.toJS();
+    const b = node?.toJSOfEntityLogicProperties && node?.toJSOfEntityLogicProperties();
+
+    return a && a !== b;
+  } catch (error) {
+    console.error(error);
+    return true;
+  }
+};
+
 export default class CallbackNode extends BreakpointNode {
   toJS() {
     const { logic, variable } = this;
@@ -10,6 +22,11 @@ export default class CallbackNode extends BreakpointNode {
     }
 
     const code = node.toJS();
+    const founctional = isFunctional(node);
+
+    if (!founctional) {
+      return code;
+    }
 
     if (!code) {
       return code;

package/src/common/BaseNode.ts

@@ -1020,7 +1020,7 @@ export class BaseNode extends EventEmitter {
    * 获取当前节点类型
    */
   @action('获取当前节点类型')
-  async getCurrentTypeAnnotation(): Promise<any> {
+  async getCurrentTypeAnnotation(outTime?: number): Promise<any> {
     /* override */
   }
 

package/src/common/Command.ts

@@ -67,7 +67,7 @@ export function invokeOnlyCommand(command: string, ...args: any[]) {
   if (process.env.NODE === 'development') {
     console.log('invokeOnlyCommand', command);
   }
-  return cmds[0]?.execute(...args);
+  return cmds?.[0]?.execute(...args);
 }
 
 export function hasCommand(command: string) {

package/src/concepts/BackendVariable__.ts

@@ -274,16 +274,23 @@ export class BackendVariable extends BaseNode {
   toJS(state?: TranslatorState): string {
     const context = this.view ? 'this' : 'Vue.prototype';
     const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
     const needGenInitFromSchema =
       typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     let code = `${this.name} =`;
     if (needGenInitFromSchema) {
-      code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
     }
     const { defaultValue } = this;
     const defaultValueType = Object.prototype.toString.call(defaultValue);
-    const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
     if (

package/src/concepts/CallFunction__.ts

@@ -522,10 +522,18 @@ export class CallFunction extends LogicItem {
 
     code += ')';
     const tyAnno = (this as any).typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = tyAnno || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
     const needGenInitFromSchema =
-      tyAnno && (!['primitive', 'union'].includes(tyAnno.typeKind) || tyAnno.typeName === 'DateTime');
+      tyAnno && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     if (needGenInitFromSchema) {
-      code = `this.$genInitFromSchema('${tyAnno?.sortedTypeKey}', ${code})`;
+      code = `this.$genInitFromSchema('${sortedTypeKey}', ${code})`;
     }
     return code;
   }

package/src/concepts/CallLogic__.ts

@@ -733,41 +733,92 @@ export class CallLogic extends LogicItem {
   }
 
   toVue(options?: ElementToVueOptions): string {
-    let code = '';
-    if (
-      this.calleeNamespace === 'nasl.browser' ||
-      this.calleeNamespace === 'nasl.auth' ||
-      this.calleeNamespace === 'nasl.configuration' ||
-      this.calleeNamespace === 'nasl.process'
-    ) {
-      code += '$global.';
-    }
-    const { completeArguments } = this;
+    const {
+      completeArguments,
+      calleeNamespace,
+      calleeName,
+      concept,
+    } = this;
 
-    if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
-      if (this.calleeNamespace) {
-        const currentElement = this.getAncestor('ViewElement') as ViewElement;
-        code += `__${currentElement.name}_dataSourceLoad`;
-        return code;
-      } else {
-        // 前端逻辑的calleeNamespace一直为空字符串
-        code += this.calleeName;
-        return code;
-      }
-    } else {
-      code += this.calleeName;
+    const setArguments = () => {
       code += '(';
       completeArguments.forEach((arg, index) => {
         code += arg?.toVue(options);
-        if (index !== completeArguments.length - 1) code += ', ';
+        if (index !== completeArguments.length - 1) {
+          code += ', ';
+        }
       });
+      code += ')';
+    };
+
+    let code = '';
+
+    if (concept === 'CallLogic') {
+      const bindAttr = this.getAncestor('BindAttribute');
+
+      if (bindAttr?.name === 'data-source') {
+        if (calleeNamespace) {
+          const currentElement = this.getAncestor('ViewElement') as ViewElement;
+          code += `__${currentElement.name}_dataSourceLoad`;
+        } else {
+          // 前端逻辑的calleeNamespace一直为空字符串
+          code += calleeName;
+        }
+        return code;
+      }
+      if (calleeName === 'jsonSerialize') {
+        if (
+          this.arguments[0]?.expression?.__TypeAnnotation?.typeName === 'String' &&
+          this.arguments[0]?.expression?.__TypeAnnotation?.typeNamespace === 'nasl.core'
+        ) {
+          code += options?.finalCode === false ? 'JSON 序列化' : 'JSON.stringify';
+        } else {
+          code += options?.finalCode === false ? 'JSON 序列化' : `$utils['JsonSerialize']`;
+        }
+        setArguments();
+        return code;
+      }
+      if (calleeName === 'jsonDeserialize') {
+        code += options?.finalCode === false ? 'JSON 反序列化' : 'JSON.parse';
+        setArguments();
+        return code;
+      }
     }
-    code += ')';
+
+    if (
+      calleeNamespace === 'nasl.browser' ||
+      calleeNamespace === 'nasl.auth' ||
+      calleeNamespace === 'nasl.configuration' ||
+      calleeNamespace === 'nasl.process'
+    ) {
+      code += '$global.';
+    }
+
+    code += calleeName;
+    setArguments();
     return code;
   }
 
   toUI(state?: TranslatorState): string {
-    let code = this.calleeName;
+    const {
+      calleeName,
+      concept,
+    } = this;
+
+    if (concept === 'CallLogic') {
+      const bindAttr = this.getAncestor('BindAttribute');
+
+      if (bindAttr?.name === 'data-source') {
+        return this.calleeName;
+      }
+      if (calleeName === 'jsonSerialize') {
+        return 'JSON 序列化';
+      } if (calleeName === 'jsonDeserialize') {
+        return 'JSON 反序列化';
+      }
+    }
+
+    let code = calleeName;
     code += '(';
 
     const node = this.getCallNode();
@@ -792,9 +843,6 @@ export class CallLogic extends LogicItem {
       });
     }
     code += ')';
-    if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
-      return this.calleeName;
-    }
 
     return code;
   }
@@ -1154,11 +1202,17 @@ export class CallLogic extends LogicItem {
       };
     }
     const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
-    const needGenInitFromSchema =
-      typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
+    const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     if (needGenInitFromSchema) {
-      code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
+      code = `this.$genInitFromSchema('${sortedTypeKey}', ${code})`;
     }
     code += ')';
     return code;
@@ -1211,9 +1265,13 @@ export class CallLogic extends LogicItem {
         code += `>`;
       }
     };
+    const currThis = this;
     /** 设置输入参数 */
     const setInputParam = function* setTypeArguments() {
       const paramRequired = ['showMessage', 'consoleLog', 'jsonDeserialize', 'jsonSerialize'].includes(calleeName);
+      if (['expression'].includes(parentKey) && currThis.getAncestor('BindAttribute')?.name === 'data-source' && (state as any)?.noNeedParams) {
+        return;
+      }
       if (
         (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) ||
         tsCalleeNamespace.startsWith('nasl.')
@@ -1227,13 +1285,6 @@ export class CallLogic extends LogicItem {
           });
         code += ')';
       } else if (completeArguments.length) {
-        if (
-          ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
-          (state as any)?.noNeedParams
-        ) {
-          return;
-        }
         code += '(';
         yield *
           wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
@@ -1243,13 +1294,6 @@ export class CallLogic extends LogicItem {
           });
         code += ')';
       } else {
-        if (
-          ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
-          (state as any)?.noNeedParams
-        ) {
-          return;
-        }
         if (completeArguments.length) {
           code += '(';
           yield *

package/src/concepts/CountersignPolicy__.ts

@@ -0,0 +1,77 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, className } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+import MultiApprovalPolicy from './MultiApprovalPolicy__';
+
+/**
+ * 会签
+ */
+@className
+@concept('会签')
+// @ts-ignore
+export class CountersignPolicy extends MultiApprovalPolicy {
+  /** 类名 */
+  static readonly ConceptName = 'CountersignPolicy';
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'CountersignPolicy';
+
+  /**
+   * passPercent
+   */
+  @property()
+  // @ts-ignore
+  passPercent!: number;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<CountersignPolicy>) {
+    source = Object.assign({}, CountersignPolicy.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): CountersignPolicy {
+    return super.from(source, parentNode, parentKey) as CountersignPolicy;
+  }
+
+  /**
+   * 设置passPercent
+   */
+  setPassPercent(passPercent: number) {
+    const object = {
+      passPercent,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default CountersignPolicy;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================