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

package/src/concepts/Connection__.ts

@@ -1,6 +1,16 @@
+import type { EmbeddedTSFileGenerator } from '../utils';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 import type { Connector } from './Connector__';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState, indent } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  indent,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -346,9 +356,12 @@ export class Connection 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;
@@ -385,12 +398,12 @@ export class Connection extends BaseNode {
     return 'app.connections';
   }
 
-  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) {
       console.log(err, '有问题翻译失败');
       code += '';
@@ -404,10 +417,16 @@ export class Connection extends BaseNode {
     };
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState, prependCode?: string, noName?: boolean, prefix?: boolean): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(
+    state = createCompilerState(),
+    prependCode?: string,
+    noName?: boolean,
+    prefix?: boolean,
+  ): TranslatorGenerator {
+    const self = this;
     let code = '';
-    code += `export function ${this.tsName}<T extends (...args: any[]) => any>(`;
+    code += `export function ${self.tsName}<T extends (...args: any[]) => any>(`;
     code += 'cb: T';
     code += `): ReturnType<T> {\n`;
     code += '\n';

package/src/concepts/Connector__.ts

@@ -1104,9 +1104,12 @@ export class Connector extends Module {
         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;
@@ -1207,9 +1210,12 @@ export class Connector extends Module {
         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;
@@ -1260,9 +1266,12 @@ export class Connector extends Module {
         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;
@@ -1313,9 +1322,12 @@ export class Connector extends Module {
         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;
@@ -1366,9 +1378,12 @@ export class Connector extends Module {
         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;

package/src/concepts/Constant__.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__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -220,9 +229,12 @@ export class Constant 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;
@@ -244,12 +256,13 @@ export class Constant extends BaseNode {
     return this.name;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    let code = this.name;
-    if (this.typeAnnotation) {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    let code = self.name;
+    if (self.typeAnnotation) {
       code += ': ';
-      code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
+      code += yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code));
     }
     // if (this.defaultValue) {
     //     code += ` = ${this.defaultValue}`;
@@ -257,12 +270,13 @@ export class Constant extends BaseNode {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTSInProcess(state?: TranslatorState): string {
-    let code = this.name;
-    if (this.typeAnnotation) {
+  @withSourceMapGenerator
+  *toEmbeddedTSInProcess(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    let code = self.name;
+    if (self.typeAnnotation) {
       code += ': undefined as ';
-      code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
+      code += yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code));
     }
     // if (this.defaultValue) {
     //     code += ` : ${this.defaultValue}`;

package/src/concepts/DataSource__.ts

@@ -1,4 +1,12 @@
-import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+import type { EmbeddedTSFileGenerator } from '../utils';
+import {
+  TranslatorState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import datasourceService from '../service/datasource';
 
 //================================================================================
@@ -306,9 +314,12 @@ export class DataSource 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;
@@ -428,21 +439,22 @@ export class DataSource extends BaseNode {
     return `/embedded/${this.rootNode?.name || this.parentNode.name}/datasources/${name}.ts`;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    let code = `export namespace ${this.name} {\n`;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    let code = `export namespace ${self.name} {\n`;
     code += 'const name = ';
-    code += `"${this.name}";\n`;
+    code += `"${self.name}";\n`;
     code += '}\n';
     return code;
   }
 
-  toEmbeddedTSFile() {
+  *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
     let code = `namespace ${this.getNamespace()} {\n`;
 
     const state = createCompilerState(code, { tabSize: 1 });
     try {
-      code += this.toEmbeddedTS(state);
+      code += yield* this.toEmbeddedTS(state);
     } catch (err) {
       code += '';
       console.error(err);

package/src/concepts/Destination__.ts

@@ -1,6 +1,16 @@
+import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
 import View from './View__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import { BindAttribute, Param } from '..';
 
@@ -294,9 +304,12 @@ export class Destination 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;
@@ -675,22 +688,23 @@ export class Destination extends LogicItem {
     return `/${viewNameAttr.join('/')}`;
   }
 
-  @withSourceMap()
-  toEmbeddedTSInProcess(state: TranslatorState, prependCode: string): string {
+  @withSourceMapGenerator
+  *toEmbeddedTSInProcess(state = createCompilerState(), prependCode: string): TranslatorGenerator {
+    const self = this;
     // const tab = indent((state?.tabSize || 0));
-    if (this.tsCalleeNamespace && this.tsName) {
-      const destinationName = this.parentNode.name.replace('-', '_');
+    if (self.tsCalleeNamespace && self.tsName) {
+      const destinationName = self.parentNode.name.replace('-', '_');
       let code = `${destinationName}: function() {\n`;
       code += prependCode;
       code += '\n';
-      if (this.tsCalleeNamespace && this.viewName) {
-        code += `${this.tsCalleeNamespace}.${this.viewName}.$destination({`;
-        if (Array.isArray(this.arguments)) {
-          this.arguments.forEach((argument: Argument) => {
-            code += `${argument.toEmbeddedTS(shiftState(state, code), false, true)}, `;
+      if (self.tsCalleeNamespace && self.viewName) {
+        code += `${self.tsCalleeNamespace}.${self.viewName}.$destination({`;
+        if (Array.isArray(self.arguments)) {
+          yield* wrapForEach(self.arguments, function* warpForEachGenerator(argument: Argument) {
+            code += `${yield* argument.toEmbeddedTS(shiftState(state, code), false, true)}, `;
           });
         }
-        code += this.anchor?.toEmbeddedTS(shiftState(state, code), true) || '';
+        code += yield* self.anchor?.toEmbeddedTS?.(shiftState(state, code), true) ?? returnOrigin('');
         code += `});\n`;
       }
       code += `${indent((state?.tabSize || 0) + 1)}}\n`;
@@ -699,53 +713,48 @@ export class Destination extends LogicItem {
     return 'destinationEmpty(){ const __destinationEmpty__: any = null}';
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-
-    const node = this.viewNode;
+    const node = self.viewNode;
     let logicParam: Param[] = [];
     if (node?.params) {
       logicParam = node.params;
     }
     const logicParamLength = logicParam.length;
-
-    if (this.parentNode instanceof BindAttribute) {
+    if (self.parentNode instanceof BindAttribute) {
       code += indent((state?.tabSize || 0) + 2);
-      if (this.tsCalleeNamespace && this.tsName) {
-        code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
-        if (Array.isArray(this.arguments)) {
-          this.arguments.forEach((argument: Argument, index) => {
+      if (self.tsCalleeNamespace && self.tsName) {
+        code += `${self.tsCalleeNamespace}.${self.tsName}.$destination({`;
+        if (Array.isArray(self.arguments)) {
+          yield* wrapForEach(self.arguments, function* warpForEachGenerator(argument: Argument, index) {
             const oldName = argument.keyword;
             if (index >= logicParamLength) {
               argument.keyword = '__unknown__';
             }
-            code += `${argument.toEmbeddedTS(shiftState(state, code), false, true)}, `;
+            code += `${yield* argument.toEmbeddedTS(shiftState(state, code), false, true)}, `;
             argument.keyword = oldName;
           });
         }
-
-        code += this.anchor?.toEmbeddedTS(shiftState(state, code), true) || '';
-
+        code += yield* self.anchor?.toEmbeddedTS?.(shiftState(state, code), true) ?? returnOrigin('');
         code += `});\n`;
       }
       return code;
     }
-    if (this.tsCalleeNamespace && this.tsName) {
-      code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
-      if (Array.isArray(this.arguments)) {
-        this.arguments.forEach((argument: Argument, index) => {
+    if (self.tsCalleeNamespace && self.tsName) {
+      code += `${self.tsCalleeNamespace}.${self.tsName}.$destination({`;
+      if (Array.isArray(self.arguments)) {
+        yield* wrapForEach(self.arguments, function* warpForEachGenerator(argument: Argument, index) {
           const oldName = argument.keyword;
           if (index >= logicParamLength) {
             argument.keyword = '__unknown__';
           }
-          code += `${argument.toEmbeddedTS(shiftState(state, code), false, true)}, `;
+          code += `${yield* argument.toEmbeddedTS(shiftState(state, code), false, true)}, `;
           argument.keyword = oldName;
         });
       }
-
-      code += this.anchor?.toEmbeddedTS(shiftState(state, code), true) || '';
-
+      code += yield* self.anchor?.toEmbeddedTS?.(shiftState(state, code), true) ?? returnOrigin('');
       code += `});\n`;
     } else {
       code += '__IDENTIFIER__';

package/src/concepts/End__.ts

@@ -1,4 +1,11 @@
-import { TranslatorState, indent, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import Return from './Return__';
 import Logic from './Logic__';
 //================================================================================
@@ -64,39 +71,41 @@ export class End extends LogicItem {
     return code;
   }
 
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
     let ret;
     let logic;
-    switch (this.parentNode.concept) {
+    switch (self.parentNode.concept) {
       case 'Logic':
-        ret = this.logic.returns[0];
+        ret = self.logic.returns[0];
         break;
       case 'AuthLogic':
-        ret = this.AuthLogic.returns[0];
+        ret = self.AuthLogic.returns[0];
         break;
       case 'AuthLogicForCallInterface':
         // 导出接口鉴权参数返回值固定为下面逻辑；
-        ret = `${indent(state?.tabSize || 0)}let ${this.parentNode.name}Result: ApiReturn; \n ${indent(
+        ret = `${indent(state?.tabSize || 0)}let ${self.parentNode.name}Result: ApiReturn; \n ${indent(
           state?.tabSize || 0,
-        )}return ${this.parentNode.name}Result;\n`;
+        )}return ${self.parentNode.name}Result;\n`;
         break;
       case 'OverriddenLogic':
-        ret = this.OverriddenLogic.returns[0];
+        ret = self.OverriddenLogic.returns[0];
         break;
       default:
         // 旧逻辑默认走这里，
         // 期望后期可以直接走完整的case， default 直接抛出异常好更明确定位错误
-        logic = logic =
-          this.parentNode.getAncestor('Logic') ||
-          this.parentNode.getAncestor('AuthLogic') ||
-          this.parentNode.getAncestor('AuthLogicForCallInterface') ||
-          this.parentNode.getAncestor('OverriddenLogic');
+        logic =
+          self.parentNode.getAncestor('Logic') ||
+          self.parentNode.getAncestor('AuthLogic') ||
+          self.parentNode.getAncestor('AuthLogicForCallInterface') ||
+          self.parentNode.getAncestor('OverriddenLogic');
         ret = (logic as Logic).returns[0];
     }
-    if (ret && this.parentNode.concept === 'AuthLogicForCallInterface') {
+    if (ret && self.parentNode.concept === 'AuthLogicForCallInterface') {
       code += ret;
-    } else if (ret && this.parentNode.concept !== 'AuthLogicForCallInterface') {
+    } else if (ret && self.parentNode.concept !== 'AuthLogicForCallInterface') {
       code += `${indent(state?.tabSize || 0)}return ${(ret as Return).name};`;
     } else {
       code += `${indent(state?.tabSize || 0)}return;`;

package/src/concepts/EntityIndex__.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';
 
 type changeType = 'up' | 'down';
 
@@ -180,9 +188,10 @@ export class EntityIndex extends BaseNode {
     });
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    return `{ ${this.name}: [${this.propertyNames.map((item) => `this.${item}`).join(', ')}] },`;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    return `{ ${self.name}: [${self.propertyNames.map((item) => `this.${item}`).join(', ')}] },`;
   }
 
   /**

package/src/concepts/EntityProperty__.ts

@@ -1,5 +1,15 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import { dataTypesMap } from './basics/types';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import CallQueryComponent from './CallQueryComponent__';
 
 type changeType = 'up' | 'down';
@@ -346,9 +356,12 @@ export class EntityProperty 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;
@@ -399,9 +412,12 @@ export class EntityProperty 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;
@@ -578,22 +594,22 @@ export class EntityProperty extends BaseNode {
     }
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-    if (this.relationNamespace && this.relationEntity && this.relationProperty) {
-      code += `@nasl.annotation.EntityRelation(new ${this.relationNamespace}.${this.relationEntity}().${this.relationProperty})\n`;
+    if (self.relationNamespace && self.relationEntity && self.relationProperty) {
+      code += `@nasl.annotation.EntityRelation(new ${self.relationNamespace}.${self.relationEntity}().${self.relationProperty})\n`;
       code += indent((state?.tabSize || 0) + 2);
       // code += indent((state?.tabSize || 0) + 1);
     }
-
-    code += this.name;
-    if (this.typeAnnotation) {
+    code += self.name;
+    if (self.typeAnnotation) {
       code += ': ';
-      code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
+      code += yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code));
     }
-    if (this.defaultValue) {
-      code += `= ${this.typeAnnotation.getDefaultValue(this.defaultValue)}`;
+    if (self.defaultValue) {
+      code += `= ${self.typeAnnotation.getDefaultValue(self.defaultValue)}`;
     }
     return code;
   }