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

package/src/concepts/BindStyle__.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__';
 //================================================================================
@@ -281,9 +290,12 @@ export class BindStyle 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;
@@ -487,16 +499,17 @@ export class BindStyle extends BaseNode {
     return value && `'${this.name}': ${value}`;
   }
 
-  @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';
     }
-    this.playground?.forEach((item, index) => {
-      code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      if (index !== this.playground.length - 1) code += ';\n';
+    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 += '}';
     return code;

package/src/concepts/BooleanLiteral__.ts

@@ -1,4 +1,12 @@
-import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -69,8 +77,8 @@ export class BooleanLiteral extends LogicItem {
     return this.value;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()) {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     return `new nasl.core.Boolean(${this.value})`;
   }
 

package/src/concepts/CallAuthInterface__.ts

@@ -1,5 +1,14 @@
+import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
 import Param from './Param__';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { getNodeByNodeCallee } from '../automate/engine/utils.js';
 import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
 import LogicItem from './LogicItem__';
@@ -253,9 +262,12 @@ export class CallAuthInterface extends CallInterface {
         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;
@@ -335,32 +347,33 @@ export class CallAuthInterface extends CallInterface {
     return authLogicName ? `${tsAuthLogicNamespace}.${authLogicName}` : '__IDENTIFIER__';
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    let code = this.tsAuthLogicKey;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    let code = self.tsAuthLogicKey;
     // 目前没有任何其他范型，故这里先支持默认俩范型
     // FIXME
     // fix: http://projectmanage.netease-official.lcap.163yun.com/dashboard/BugDetail?id=2676637477443328
     if (code !== '__IDENTIFIER__') {
-      code += `<Parameters<typeof ${this.tsCalleeKey}>[0], ReturnType<typeof ${this.tsCalleeKey}>>`;
+      code += `<Parameters<typeof ${self.tsCalleeKey}>[0], ReturnType<typeof ${self.tsCalleeKey}>>`;
     }
     code += '(';
-    const { completeAuthArguments } = this;
+    const { completeAuthArguments } = self;
     if (completeAuthArguments?.length) {
       code += '{';
-      completeAuthArguments?.forEach((arg, index) => {
-        code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
+      yield* wrapForEach(completeAuthArguments, function* warpForEachGenerator(arg, index) {
+        code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
         code += ',';
       });
       code += `api: `;
-      code += this.tsCalleeKey;
-      const { completeArguments } = this;
+      code += self.tsCalleeKey;
+      const { completeArguments } = self;
       code += '(';
       if (completeArguments?.length) {
         code += '{';
-        completeArguments?.forEach((arg, index) => {
-          code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
-          if (index !== this.arguments?.length - 1) code += ', ';
+        yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+          code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
+          if (index !== self.arguments?.length - 1) code += ', ';
         });
         code += '}';
       }
@@ -369,35 +382,33 @@ export class CallAuthInterface extends CallInterface {
     } else {
       code += '{';
       code += 'api: ';
-      code += this.tsCalleeKey;
-      const { completeArguments } = this;
+      code += self.tsCalleeKey;
+      const { completeArguments } = self;
       code += '(';
       if (completeArguments?.length) {
         code += '{';
-        completeArguments?.forEach((arg, index) => {
-          code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
-          if (index !== this.arguments?.length - 1) code += ', ';
+        yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+          code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
+          if (index !== self.arguments?.length - 1) code += ', ';
         });
         code += '}';
       }
       code += ')';
       code += '}';
     }
-
     code += ')';
-
     if (
-      this.parentNode.concept !== 'Argument' &&
-      this.parentKey !== 'test' &&
-      this.parentKey !== 'patterns' &&
-      this.parentNode.concept !== 'Assignment' &&
-      this.parentNode.concept !== 'ForEachStatement' &&
-      this.parentNode.concept !== 'SelectMembers' &&
-      this.parentNode.concept !== 'BinaryExpression' &&
-      this.parentNode.concept !== 'MemberExpression' &&
-      this.parentNode.concept !== 'StringInterpolation' &&
-      !['NewMap', 'NewList'].includes(this.parentNode.concept) &&
-      this.parentKey !== 'returnExpression'
+      self.parentNode.concept !== 'Argument' &&
+      self.parentKey !== 'test' &&
+      self.parentKey !== 'patterns' &&
+      self.parentNode.concept !== 'Assignment' &&
+      self.parentNode.concept !== 'ForEachStatement' &&
+      self.parentNode.concept !== 'SelectMembers' &&
+      self.parentNode.concept !== 'BinaryExpression' &&
+      self.parentNode.concept !== 'MemberExpression' &&
+      self.parentNode.concept !== 'StringInterpolation' &&
+      !['NewMap', 'NewList'].includes(self.parentNode.concept) &&
+      self.parentKey !== 'returnExpression'
     ) {
       code += ';';
     }

package/src/concepts/CallConnector__.ts

@@ -1,3 +1,4 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import type Connector from './Connector__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 import Logic from './Logic__';
@@ -5,7 +6,15 @@ import Argument from './Argument__';
 import Identifier from './Identifier__';
 import TypeAnnotation from './TypeAnnotation__';
 import Connection from './Connection__';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import Namespace from './Namespace__';
 
 //================================================================================
@@ -219,49 +228,48 @@ export class CallConnector extends CallLogic {
     });
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-    if (this.handleError) {
+    if (self.handleError) {
       code += 'nasl.util.autoHandleError(';
     }
-    code += this.calleeTSConnectionKey;
+    code += self.calleeTSConnectionKey;
     code += '(() => ';
-    code += this.calleeKey;
-    if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+    code += self.calleeKey;
+    if (Array.isArray(self.typeArguments) && self.typeArguments.length) {
       // 如果有内容
-      const typeAnnotation = this.typeArguments[0];
+      const typeAnnotation = self.typeArguments[0];
       code += `<`;
-      code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
+      code += `${yield* typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
     }
-
-    const { completeArguments } = this;
+    const { completeArguments } = self;
     if (completeArguments.length) {
       code += '(';
-      completeArguments.forEach((arg, index) => {
+      yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
         // 取到是不是必填放入参数中
-        code += arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
-        if (index !== this.arguments.length - 1) code += ', ';
+        code += yield* arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
+        if (index !== self.arguments.length - 1) code += ', ';
       });
       code += ')';
     } else {
       code += '()';
     }
-
-    if (this.handleError) {
+    if (self.handleError) {
       code += ')';
     }
     if (
-      this.parentNode.concept !== 'Argument' &&
-      this.parentKey !== 'test' &&
-      this.parentKey !== 'patterns' &&
-      this.parentNode.concept !== 'Assignment' &&
-      this.parentNode.concept !== 'ForEachStatement' &&
-      this.parentNode.concept !== 'SelectMembers' &&
-      this.parentNode.concept !== 'BinaryExpression' &&
-      this.parentNode.concept !== 'StringInterpolation' &&
-      this.parentNode.concept !== 'MemberExpression' &&
-      !['NewMap', 'NewList'].includes(this.parentNode.concept)
+      self.parentNode.concept !== 'Argument' &&
+      self.parentKey !== 'test' &&
+      self.parentKey !== 'patterns' &&
+      self.parentNode.concept !== 'Assignment' &&
+      self.parentNode.concept !== 'ForEachStatement' &&
+      self.parentNode.concept !== 'SelectMembers' &&
+      self.parentNode.concept !== 'BinaryExpression' &&
+      self.parentNode.concept !== 'StringInterpolation' &&
+      self.parentNode.concept !== 'MemberExpression' &&
+      !['NewMap', 'NewList'].includes(self.parentNode.concept)
     ) {
       code += ');';
     }

package/src/concepts/CallFunction__.ts

@@ -1,3 +1,4 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
   shiftState,
@@ -6,6 +7,9 @@ import {
   createCompilerState,
   transfromMetadataType,
   transfromUnionTypeAnnotation,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
 } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
@@ -329,9 +333,12 @@ export class CallFunction 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;
@@ -368,9 +375,12 @@ export class CallFunction 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;
@@ -618,39 +628,40 @@ export class CallFunction extends LogicItem {
     }
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-    const { calleeKey } = this;
+    const { calleeKey } = self;
     if (['nasl.util.Convert', 'nasl.util.FromString'].includes(calleeKey)) {
       // nasl.util.Convert(variable1)<nasl.core.String>();
       // 单独处理
-
       code = calleeKey;
       code += '(';
-      this.arguments.forEach((arg, index) => {
-        code += arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
-        if (index !== this.arguments.length - 1) code += ', ';
+      yield* wrapForEach(self.arguments, function* warpForEachGenerator(arg, index) {
+        code += yield* arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+        if (index !== self.arguments.length - 1) code += ', ';
       });
       code += ')';
       // 如果有内容
-      const typeAnnotation = this.typeArguments[0];
+      const typeAnnotation = self.typeArguments[0];
       code += `<`;
-      code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
+      code += `${yield* typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
     } else {
-      code = this.calleeKey;
-      if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+      code = self.calleeKey;
+      if (Array.isArray(self.typeArguments) && self.typeArguments.length) {
         // 如果有内容
-        const typeAnnotation = this.typeArguments[0];
+        const typeAnnotation = self.typeArguments[0];
         code += `<`;
-        code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
+        code += `${yield* typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
       }
       code += '(';
-      Array.isArray(this.arguments) &&
-        this.arguments.forEach((arg, index) => {
-          code += arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
-          if (index !== this.arguments.length - 1) code += ', ';
+      if (Array.isArray(self.arguments)) {
+        yield* wrapForEach(self.arguments, function* wrapForEach(arg, index) {
+          code += yield* arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+          if (index !== self.arguments.length - 1) code += ', ';
         });
+      }
       code += ')';
     }
     return code;

package/src/concepts/CallInterface__.ts

@@ -1,4 +1,13 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import Interface from './Interface__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
@@ -216,9 +225,12 @@ export class CallInterface 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;
@@ -434,17 +446,16 @@ export class CallInterface extends LogicItem {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    const { completeArguments, parentNode, parentKey, tsCalleeKey } = this;
-
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    const { completeArguments, parentNode, parentKey, tsCalleeKey } = self;
     let code = `${tsCalleeKey}(`;
-
     if (completeArguments?.length) {
       code += '{';
-      completeArguments?.forEach((arg, index) => {
-        code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
-        if (index !== this.arguments?.length - 1) code += ', ';
+      yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+        code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
+        if (index !== self.arguments?.length - 1) code += ', ';
       });
       code += '}';
     }
@@ -624,37 +635,17 @@ export class CallInterface extends LogicItem {
     const calleeNamespace = _interface.getNamespace();
     const calleeName = _interface.name;
     // 保留之前的参数
-    const params = _interface.params.reduce((res, param) => {
+    const params = _interface.params.map((param) => {
       const oldArgument = this.arguments.find((node) => node.keyword === param.name);
-      if (oldArgument && oldArgument.expression) {
-        res.push(Argument.from(
-          {
-            keyword: param.name,
-            expression: oldArgument.expression,
-          },
-          this,
-          'arguments',
-        ));
-      }
-      return res
-    }, []);
-    const oldArguments = this.arguments.reduce((res, argumentNode) => {
-      const targetParam = _interface.params.find((item) => item.name === argumentNode.keyword);
-      if (!targetParam && argumentNode && argumentNode.expression) {
-        res.push(
-          Argument.from(
-            {
-              keyword: argumentNode.keyword,
-              expression: argumentNode.expression,
-            },
-            this,
-            'arguments',
-          ),
-        );
-      }
-      return res;
-    }, []);
-    params.push(...oldArguments);
+      return Argument.from(
+        {
+          keyword: param.name,
+          expression: oldArgument?.expression,
+        },
+        this,
+        'arguments',
+      );
+    });
 
     if (this.app) {
       this.app.emit('collect:start', {