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

package/src/concepts/BinaryExpression__.ts

@@ -1,4 +1,13 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
 const operatorMap = {
@@ -230,9 +239,12 @@ export class BinaryExpression extends LogicItem {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -388,21 +400,24 @@ export class BinaryExpression extends LogicItem {
     return `(${this.left.toBrief()} ${this.operator} ${this.right.toBrief()})`;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    if (['startwith', 'endwith', 'like', 'in'].includes(this.operator)) {
-      const fnName = this.operator.toUpperCase();
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    if (['startwith', 'endwith', 'like', 'in'].includes(self.operator)) {
+      const fnName = self.operator.toUpperCase();
       let code = '';
       code += `nasl.langUtil.${fnName}(`;
-      code += this.left?.toEmbeddedTS ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+      code += self.left?.toEmbeddedTS
+        ? yield* self.left.toEmbeddedTS(shiftState(state, code, { inline: true }))
+        : '__LEFT__';
       code += ', ';
-      code += this.right?.toEmbeddedTS
-        ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
+      code += self.right?.toEmbeddedTS
+        ? yield* self.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
         : '__RIGHT__';
       code += ')';
       return code;
     }
-    if (['&&', '||', '+', '-', '*', '/', '%', '==', '!=', '>', '<', '>=', '<='].includes(this.operator)) {
+    if (['&&', '||', '+', '-', '*', '/', '%', '==', '!=', '>', '<', '>=', '<='].includes(self.operator)) {
       const operatorMap = {
         '&&': 'and',
         '||': 'or',
@@ -419,20 +434,25 @@ export class BinaryExpression extends LogicItem {
         '<=': 'lessThanOrEqual',
       };
       let code = '';
-      code += `nasl.core.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
-      code += this.left?.toEmbeddedTS ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+      code += `nasl.core.${operatorMap[self.operator as keyof typeof operatorMap]}(`;
+      code += self.left?.toEmbeddedTS
+        ? yield* self.left.toEmbeddedTS(shiftState(state, code, { inline: true }))
+        : '__LEFT__';
       code += `,`;
-      code += this.right?.toEmbeddedTS
-        ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
+      code += self.right?.toEmbeddedTS
+        ? yield* self.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
         : '__RIGHT__';
       code += ')';
       return code;
     }
-
     let code = '';
-    code += this.left?.toEmbeddedTS ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
-    code += ` ${this.operator} `;
-    code += this.right?.toEmbeddedTS ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+    code += self.left?.toEmbeddedTS
+      ? yield* self.left.toEmbeddedTS(shiftState(state, code, { inline: true }))
+      : '__LEFT__';
+    code += ` ${self.operator} `;
+    code += self.right?.toEmbeddedTS
+      ? yield* self.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
+      : '__RIGHT__';
     return code;
   }
 

package/src/concepts/BindAttribute__.ts

@@ -1,3 +1,4 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
   indent,
@@ -5,8 +6,12 @@ import {
   withSourceMap,
   createCompilerState,
   transfromUnionTypeAnnotation,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
+import { SyntaxNode } from './types__';
 import Namespace from './Namespace__';
 import MemberExpression from './MemberExpression__';
 
@@ -685,9 +690,12 @@ export class BindAttribute extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -788,7 +796,7 @@ export class BindAttribute extends BaseNode {
   // 获取表达式在页面中的名字
   get expressionNameInView() {
     const nameList: string[] = [];
-    let node: BaseNode = this;
+    let node: SyntaxNode = this;
     while (node) {
       nameList.unshift(node.name);
       if (node.concept === 'ViewElement') {
@@ -944,6 +952,53 @@ export class BindAttribute extends BaseNode {
     return code;
   }
 
+  get shouldExcluded() {
+    // 暂时过滤掉插槽内的变量
+    const args = this.getArgsList() || [];
+    return args.length || (this.name === 'value' && ["u-number-input", 'u-input'].includes((this?.parentNode as any)?.tag));
+  }
+
+  get syncVariableName() {
+    if (this.sync) {
+      const newName = this.name.replace(/-/g, '');
+      // 名称规则：组件的名称 + sync + 属性的名称 + change 用下划线链接
+      return `${this.parentNode?.name}_sync_${newName}`;
+    }
+  }
+
+  // 双向绑定属性的方法名
+  get syncMethodName() {
+    if (this.sync) {
+      const newName = this.name.replace(/-/g, '');
+      // 名称规则：组件的名称 + sync + 属性的名称 + change 用下划线链接
+      return `${this.parentNode?.name}_sync_${newName}_change`;
+    }
+  }
+
+  // 双向绑定属性的事件名
+  get syncEventName() {
+    if (this.sync) {
+      return `update:${this.name}`;
+    }
+  }
+
+  // 数据源绑定了页面逻辑变量
+  get isExpressionViewLogicIdentifier() {
+    let flag = false;
+    const expTypeAnnotation = (this.expression as any)?.typeAnnotation || this.expression?.__TypeAnnotation;
+    const { typeName } = expTypeAnnotation || {};
+    if (this.expression?.concept === 'Identifier') {
+      const view = this.getAncestor('View') as View;
+      const viewLogic = view.logics?.find((logic) => {
+        return logic.name === this.expression?.name;
+      });
+      if (viewLogic && typeName === this.expression.name) {
+        flag = true;
+      }
+    }
+    return flag;
+  }
+
   /**
    * 转换成 Vue 的模板格式
    */
@@ -953,6 +1008,8 @@ export class BindAttribute extends BaseNode {
     if (value === 'undefined') {
       value = undefined;
     }
+    // 已经转换了data-source
+    let hasTransDataSource = false;
     if (this.type === 'dynamic' || (this.name === 'rules' && this.rules)) {
       // 需要用标识符替换
       // if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
@@ -966,6 +1023,17 @@ export class BindAttribute extends BaseNode {
         value = (this as any)?.[this.name]?.toVue(options) || '';
       } else if ('ArrowFunctionExpression'.includes(this.expression?.concept)) {
         value = this.value;
+      } else if (this.name === 'data-source') {
+        if (
+          this.isExpressionViewLogicIdentifier
+          || (this.expression as any)?.concept === 'CallLogic'
+        ) {
+          hasTransDataSource = true;
+          const currentElement = this.getAncestor('ViewElement') as ViewElement;
+          value = `__${currentElement?.name}_dataSourceLoad`;
+        } else {
+          value = this.expression?.toVue(options) || '';
+        }
       } else {
         value = this.expression?.toVue(options) || '';
       }
@@ -1017,16 +1085,35 @@ export class BindAttribute extends BaseNode {
         name = 'href';
       }
       // 文本默认要经过toString转换
-      if (options?.finalCode !== false && name === 'text' && !this.sync && this.type === 'dynamic') {
+      if (options?.finalCode !== false && this.type === 'dynamic') {
         const expTypeAnnotation = (this.expression as any)?.typeAnnotation || this.expression?.__TypeAnnotation;
-        transfromUnionTypeAnnotation(expTypeAnnotation, this.app);
-        if (expTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
-          const referenceNode =
-            this.app.findNodeByCompleteName(expTypeAnnotation.typeNamespace + '.' + expTypeAnnotation.typeName)
-              ?.typeAnnotation || {};
-          value = `$utils['ToString']('${referenceNode?.typeNamespace}.${referenceNode.typeName}', ${value})`;
-        } else {
-          value = `$utils['ToString']('${expTypeAnnotation?.sortedTypeKey}', ${value})`;
+        const { typeKind, typeNamespace, typeName } = expTypeAnnotation || {};
+        const isPrimitive = typeKind === 'primitive'
+          && typeNamespace === 'nasl.core'
+          && ['Boolean', 'String', 'Date', 'Time', 'DateTime'].includes(typeName);
+        const isEnums = utils.findConceptKeyWordByNamespace(typeNamespace) === 'enums';
+        // 文本默认要经过toString转换
+        if (name === 'text' && !this.sync) {
+          transfromUnionTypeAnnotation(expTypeAnnotation, this.app);
+          if (expTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
+            const referenceNode =
+              this.app.findNodeByCompleteName(expTypeAnnotation.typeNamespace + '.' + expTypeAnnotation.typeName)
+                ?.typeAnnotation || {};
+            value = `$utils['ToString']('${referenceNode?.typeNamespace}.${referenceNode.typeName}', ${value})`;
+          } else {
+            value = `$utils['ToString']('${expTypeAnnotation?.sortedTypeKey}', ${value})`;
+          }
+        } else if (
+          // 除去基础类型和枚举，其他均需要去除包装类的包裹
+          !(isPrimitive || isEnums || hasTransDataSource)
+        ) {
+          if (this.shouldExcluded) {
+            value = `${value}`;
+          } else if (this.sync) {
+            value = this.syncVariableName;
+          } else {
+            value = `$utils['RmWrapClass'](${value})`;
+          }
         }
       }
       if (this.type === 'string' && name !== 'rules') {
@@ -1035,14 +1122,14 @@ export class BindAttribute extends BaseNode {
         } else {
           str += `${name}="${value}"`;
         }
-      } else if (this.sync) {
-        str += `:${name}.sync="${value}"`;
       } else if (name === 'destination') {
         str += `:destination="${value}"`;
       } else if (name === 'externalDestination') {
         str += `:link="${value}"`;
       } else if (name === 'rules') {
         str += `:${name}="${value}"`;
+      } else if (this.sync && this.shouldExcluded) {
+        str += `:${name}.sync="${value}"`;
       } else {
         str += `:${name}="${value}"`;
       }
@@ -1053,27 +1140,39 @@ export class BindAttribute extends BaseNode {
     return str;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    const { name, type, value, rules, expression, playground } = this;
+  toJS(state?: TranslatorState): string {
+    // 暂时过滤掉插槽内的变量
+    const args = this.getArgsList() || [];
+    if (!args.length && this.sync && ['Identifier', 'MemberExpression'].includes(this.expression?.concept)) {
+      const argsList =['$event', ...args];
+      const expTypeAnnotation = (this.expression as any)?.typeAnnotation || this.expression?.__TypeAnnotation;
+      const code = `${this.syncMethodName} (${argsList.join(', ')}) {
+        ${this.expression.toJS()} = this.$utils['AddWrapClass']('${expTypeAnnotation.sortedTypeKey}', $event, ${this.expression.toJS()});
+      }`;
+      return code;
+    }
+  }
 
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    const { name, type, value, rules, expression, playground } = self;
     let code = '';
-    if (this?.name === 'data-source' && this?.expression?.concept === 'CallLogic') {
+    if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
       code = `() => {`;
     } else {
       code = '() => {';
     }
-
     if (['destination', 'externalDestination'].includes(name) && type === 'dynamic') {
-      code += (this as any)[name].toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+      code += yield* (self as any)[name].toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
       code += ';\n';
     } else if (name === 'rules') {
-      rules?.forEach((item, index) => {
-        code += item.toEmbeddedTS(shiftState(state, code));
+      yield* wrapForEach(rules, function* warpForEachGenerator(item, index) {
+        code += yield* item.toEmbeddedTS(shiftState(state, code));
         code += ';\n';
       });
     } else if (expression) {
-      code += expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+      code += yield* expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
       code += ';\n';
     } else if (name === 'url' && value) {
       /**
@@ -1101,45 +1200,46 @@ export class BindAttribute extends BaseNode {
       }
     }
     if (type === 'dynamic') {
-      playground?.forEach((item, index) => {
-        code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+      yield* wrapForEach(playground, function* warpForEachGenerator(item, index) {
+        code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         code += ';\n';
       });
     }
-
     code += '}';
     return code;
   }
 
-  toEmbeddedTSVariableDefinition(
-    state?: TranslatorState,
+  @withGenerator
+  *toEmbeddedTSVariableDefinition(
+    state = createCompilerState(),
     attrList?: string[],
     elementName?: string,
     currentLevel?: string,
-  ): string {
+  ): TranslatorGenerator {
+    const self = this;
     let code = '';
     let arrCode = '';
     code += indent((state?.tabSize || 0) + 3);
-    code += `${attrConvertCamelCase(this.name)}: `;
-    if (this.expression) {
-      if (this.name === 'data-source') {
-        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}>`;
+    code += `${attrConvertCamelCase(self.name)}: `;
+    if (self.expression) {
+      if (self.name === 'data-source') {
+        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(self.name)}>`;
       } else {
-        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}>`;
+        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(self.name)}>`;
       }
       arrCode = `() => {
-        return __elements_variable_function.${currentLevel}?.${attrConvertCamelCase(this.name)}?.()
+        return __elements_variable_function.${currentLevel}?.${attrConvertCamelCase(self.name)}?.()
       }`;
-    } else if (this.name === 'sorting') {
+    } else if (self.name === 'sorting') {
       code += `{
               field: nasl.core.String
               order: nasl.core.String
           }`;
-    } else if (this.type === 'static') {
+    } else if (self.type === 'static') {
       let type = 'nasl.core.String';
-      if (typeof this.value === 'number') {
-        type = `${this.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
-      } else if (typeof this.value === 'boolean') {
+      if (typeof self.value === 'number') {
+        type = `${self.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
+      } else if (typeof self.value === 'boolean') {
         type = 'nasl.core.Boolean';
       }
       code += `${type}`;
@@ -1148,27 +1248,29 @@ export class BindAttribute extends BaseNode {
     }
     code += `\n`;
     if (arrCode.length > 0) {
-      attrList.push(`${elementName}_${attrConvertCamelCase(this.name)}: ${arrCode},\n`);
+      attrList.push(`${elementName}_${attrConvertCamelCase(self.name)}: ${arrCode},\n`);
     }
     return code;
   }
-  toEmbeddedTSVariableFunctionDefinition(state?: TranslatorState): string {
+  @withGenerator
+  *toEmbeddedTSVariableFunctionDefinition(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-    if (this.expression) {
+    if (self.expression) {
       code += indent((state?.tabSize || 0) + 4);
-      code += `${attrConvertCamelCase(this.name)}: `;
+      code += `${attrConvertCamelCase(self.name)}: `;
       let stashVariable;
-      if (this.name === 'data-source') {
+      if (self.name === 'data-source') {
         const extraParams = {
           tabSize: 4,
           inline: true,
           noNeedParams: true,
         };
-        stashVariable = `${this.expression.toEmbeddedTS(
-          shiftState(state, code, this?.expression?.concept === 'CallLogic' ? extraParams : {}),
+        stashVariable = `${yield* self.expression.toEmbeddedTS(
+          shiftState(state, code, self?.expression?.concept === 'CallLogic' ? extraParams : {}),
         )}`;
       } else {
-        stashVariable = `${this.expression.toEmbeddedTS()}`;
+        stashVariable = `${yield* self.expression.toEmbeddedTS()}`;
       }
       code += `() => {\n`;
       code += indent((state?.tabSize || 0) + 5);

package/src/concepts/BindDirective__.ts

@@ -1,4 +1,13 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 //================================================================================
@@ -316,9 +325,12 @@ export class BindDirective extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -604,17 +616,18 @@ export class BindDirective extends BaseNode {
     return str;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '()=>{';
-    if (this.expression) {
-      code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+    if (self.expression) {
+      code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
       code += ';\n';
     }
-    if (this.type === 'dynamic') {
-      this.playground?.forEach((item, index) => {
-        code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-        if (index !== this.playground.length - 1) code += ';\n';
+    if (self.type === 'dynamic') {
+      yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
+        code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+        if (index !== self.playground.length - 1) code += ';\n';
       });
     }
     code += '}';

package/src/concepts/BindEvent__.ts

@@ -1,6 +1,17 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import type { EmbeddedTSFileGenerator } from '../utils';
 import LogicItem from './LogicItem__';
 import Namespace from './Namespace__';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import { elementsEventsMap } from '../server/createUiTs';
 import Param from './Param__';
@@ -465,9 +476,12 @@ export class BindEvent extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -504,9 +518,12 @@ export class BindEvent extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -571,16 +588,17 @@ export class BindEvent extends BaseNode {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState, isPageCycle?: Boolean): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState(), isPageCycle?: Boolean): TranslatorGenerator {
+    const self = this;
     // 如果有绑定的事件名
     let code = ``;
     if (isPageCycle) {
-      if (['keydown', 'keyup'].includes(this.name)) {
-        code = `const ${this.toHump(this.name) || '__IDENTIFIER__'} = (event: `;
-        code += this.getEventTypeString();
+      if (['keydown', 'keyup'].includes(self.name)) {
+        code = `const ${self.toHump(self.name) || '__IDENTIFIER__'} = (event: `;
+        code += self.getEventTypeString();
         code += ') => [\n';
-        this.logics.forEach((logic) => {
+        yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
           // 一些默认的逻辑不翻译 排除掉
           if (logic.name.startsWith('__')) {
             return;
@@ -590,10 +608,9 @@ export class BindEvent extends BaseNode {
             if ((logic.parentNode as BindEvent)?.element) {
               logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
             }
-
             logic.name = logic.name.replace(/-/g, '');
             try {
-              code += logic.toEmbeddedTS(
+              code += yield* logic.toEmbeddedTS(
                 shiftState(state, code, {
                   tabSize: (state?.tabSize || 0) + 2,
                 }),
@@ -604,23 +621,22 @@ export class BindEvent extends BaseNode {
               logic.name = logicName;
             }
           } else {
-            code += logic.toEmbeddedTS(
+            code += yield* logic.toEmbeddedTS(
               shiftState(state, code, {
                 tabSize: (state?.tabSize || 0) + 2,
               }),
               'noExport',
             );
           }
-
           code += indent(state?.tabSize || 0);
           code += ',\n';
         });
         code += '];\n';
       } else {
-        this.logics.forEach((logic, index) => {
+        yield* wrapForEach(self.logics, function* warpForEachGenerator(logic, index) {
           const logicName = logic.name;
           logic.name = logic.view.name + logic.name + index;
-          code += logic.toEmbeddedTS(
+          code += yield* logic.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 2,
             }),
@@ -633,14 +649,11 @@ export class BindEvent extends BaseNode {
       }
       return code;
     }
-
-    code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event: `;
-
+    code = `${self.toHump(self.name) || '__IDENTIFIER__'}: (event: `;
     // event的类型
-    code += this.getEventTypeString();
-
+    code += self.getEventTypeString();
     code += ') => [\n';
-    this.logics.forEach((logic) => {
+    yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
       // 一些默认的逻辑不翻译 排除掉
       if (logic.name.startsWith('__')) {
         return;
@@ -650,10 +663,9 @@ export class BindEvent extends BaseNode {
         if ((logic.parentNode as BindEvent)?.element) {
           logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
         }
-
         logic.name = logic.name.replace(/-/g, '');
         try {
-          code += logic.toEmbeddedTS(
+          code += yield* logic.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 2,
             }),
@@ -664,18 +676,17 @@ export class BindEvent extends BaseNode {
           logic.name = logicName;
         }
       } else {
-        code += logic.toEmbeddedTS(
+        code += yield* logic.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 2,
           }),
           'noExport',
         );
       }
-
       code += indent(state?.tabSize || 0);
       code += ',\n';
     });
-    if (this.view) code += '],\n';
+    if (self.view) code += '],\n';
     else code += ']\n';
     return code;
   }
@@ -1078,14 +1089,14 @@ export class BindEvent extends BaseNode {
       return `${arr.join('.')}.bindEvents`;
     } else throw new Error('无法获取命名空间，请设置 parentNode！');
   }
-  toEmbeddedTSFile() {
+  *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
     let code = `namespace ${this.getTsNamespace()} {\n`;
     const state = createCompilerState(code, {
       tabSize: 1,
     });
 
     try {
-      code += this.toEmbeddedTS(state);
+      code += yield* this.toEmbeddedTS(state);
     } catch (err) {
       code += '';
       console.log(err);