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

package/src/concepts/Entity__.ts

@@ -1,5 +1,16 @@
+import { wrapForEachToGenerator as wrapForEach, runGeneratorSync as runSync } from '../utils/time-slicing';
+import type { EmbeddedTSFileGenerator } from '../utils';
 import Namespace from './Namespace__';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
 import CallQueryComponent from './CallQueryComponent__';
 //================================================================================
@@ -488,9 +499,12 @@ export class Entity 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;
@@ -541,9 +555,12 @@ export class Entity 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;
@@ -820,42 +837,40 @@ export class Entity extends BaseNode {
     };
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    let code = `export class ${this.name} {\n`;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    let code = `export class ${self.name} {\n`;
     code += indent((state?.tabSize || 0) + 1);
-    code += `__name: '${this.getNamespace()}.${this.name}';\n`;
-    this.properties.forEach((property) => {
+    code += `__name: '${self.getNamespace()}.${self.name}';\n`;
+    yield* wrapForEach(self.properties, function* warpForEachGenerator(property) {
       code += indent((state?.tabSize || 0) + 1);
-      code += property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+      code += yield* property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
       code += ';\n';
     });
-    if (this.indexes && this.indexes.length) {
+    if (self.indexes && self.indexes.length) {
       code += indent((state?.tabSize || 0) + 1);
       code += `__IndexList() {\n`;
       code += `            return [`;
-      this.indexes.forEach((entityIndex) => {
+      yield* wrapForEach(self.indexes, function* warpForEachGenerator(entityIndex) {
         code += indent((state?.tabSize || 0) + 1);
         code += '\n                ';
-        code += entityIndex.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+        code += yield* entityIndex.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
       });
       code += `${indent(state?.tabSize || 0)}\n            ];\n        }\n`;
     }
-
-    const { ns } = this;
-
+    const { ns } = self;
     /**
      * 11个函数的总行数
      * 如果修改这里,可能会影响到dataSource的重命名,  在naslserver中,可能要一起修改
      */
     code += `\nstatic logics = {\n`;
-    ns.logics.forEach((logic) => {
+    yield* wrapForEach(ns.logics, function* warpForEachGenerator(logic) {
       code += indent((state?.tabSize || 0) + 1);
-      code += logic.toEmbeddedTS(shiftState(state, code), 'inObject');
+      code += yield* logic.toEmbeddedTS(shiftState(state, code), 'inObject');
     });
     code += '}\n';
     code += `${indent(state?.tabSize || 0)}}\n`;
-
     return code;
   }
 
@@ -873,7 +888,7 @@ export class Entity extends BaseNode {
       this.indexes.forEach((entityIndex) => {
         code += indent(state.tabSize + 1);
         code += '\n                ';
-        code += entityIndex.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        code += runSync(entityIndex.toEmbeddedTS(shiftState(state, code, { inline: true })));
       });
       code += `${indent(state.tabSize)}\n            ];\n        }\n`;
     }
@@ -912,13 +927,13 @@ export class Entity extends BaseNode {
     return ns.logics;
   }
 
-  toEmbeddedTSFile() {
+  *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
     let code = `namespace ${this.getNamespace()} {\n`;
     code += '    @nasl.annotation.Entity()\n';
 
     const state = createCompilerState(code, { tabSize: 1 });
     try {
-      code += this.toEmbeddedTS(state);
+      code += yield* this.toEmbeddedTS(state);
     } catch (err) {
       code += '';
       console.log(err);

package/src/concepts/EnumItem__.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';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -121,9 +129,10 @@ export class EnumItem extends BaseNode {
   @property()
   expression: undefined;
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    return `static '${this.value}': ${this.enumeration.name}`;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    return `static '${self.value}': ${self.enumeration.name}`;
   }
 
   @withSourceMap()

package/src/concepts/Enum__.ts

@@ -1,4 +1,15 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import type { EmbeddedTSFileGenerator } from '../utils';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import Namespace from './Namespace__';
 import Identifier from './Identifier__';
 //================================================================================
@@ -264,9 +275,12 @@ export class Enum 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;
@@ -300,14 +314,15 @@ export class Enum extends BaseNode {
     return utils.unique(name, this.getEnumItemExistingNames(), undefined, false);
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    let code = `export class ${this.name} extends nasl.core.Enums {\n`;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    let code = `export class ${self.name} extends nasl.core.Enums {\n`;
     // 增加一个单独的标签
-    code += `${indent((state?.tabSize || 0) + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
-    this.enumItems.forEach((property) => {
+    code += `${indent((state?.tabSize || 0) + 1)}__name: '${self.getNamespace()}.${self.name}';\n`;
+    yield* wrapForEach(self.enumItems, function* warpForEachGenerator(property) {
       code += indent((state?.tabSize || 0) + 1);
-      code += property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+      code += yield* property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
       code += ';\n';
     });
     code += `
@@ -317,7 +332,6 @@ export class Enum extends BaseNode {
         }
         `;
     code += `${indent(state?.tabSize || 0)}}\n`;
-
     return code;
   }
 
@@ -356,12 +370,12 @@ export class Enum extends BaseNode {
     return `/embedded/${this.app.name}${_path}/enums/${name}.ts`;
   }
 
-  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.log(err);

package/src/concepts/Event__.ts

@@ -313,9 +313,12 @@ export class Event 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;

package/src/concepts/ExternalDestination__.ts

@@ -1,4 +1,13 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { returnOrigin } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+  createCompilerState,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import StringLiteral from './StringLiteral__';
 import { BindAttribute, ViewElement, Param } from '..';
@@ -178,9 +187,12 @@ export class ExternalDestination 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;
@@ -190,17 +202,17 @@ export class ExternalDestination extends LogicItem {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-  @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState, isHaveKeyWord?: boolean): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState(), isHaveKeyWord?: boolean): TranslatorGenerator {
+    const self = this;
     let code = '';
-    if (this.link) {
-      code += `${this.link.toEmbeddedTS(shiftState(state, code))};`;
+    if (self.link) {
+      code += `${yield* self.link.toEmbeddedTS(shiftState(state, code))};`;
     } else {
       code += '__IDENTIFIER__;';
     }
     // code += this.anchor?.expression?.toEmbeddedTS(shiftState(state, code)) + ';' || '';
-    code += this.anchor?.toEmbeddedTS(shiftState(state, code), true) || '';
-
+    code += yield* self.anchor?.toEmbeddedTS(shiftState(state, code), true) ?? returnOrigin('');
     return code;
   }
 

package/src/concepts/ForEachStatement__.ts

@@ -1,4 +1,14 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import TypeAnnotation from './TypeAnnotation__';
 import Identifier from './Identifier__';
 import MemberExpression from './MemberExpression__';
@@ -368,9 +378,12 @@ export class ForEachStatement 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;
@@ -446,9 +459,12 @@ export class ForEachStatement 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;
@@ -541,29 +557,30 @@ export class ForEachStatement extends LogicItem {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-    code += this.each
-      ? this.each.toEmbeddedTS(
+    code += self.each
+      ? yield* self.each.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: 0,
           }),
         )
       : '__IDENTIFIER__';
-    if (['NewList', 'NewMap'].includes(this.each?.concept)) code += '\n';
+    if (['NewList', 'NewMap'].includes(self.each?.concept)) code += '\n';
     code += '.__slice(';
-    code += this.start ? this.start.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += self.start ? yield* self.start.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';
     code += ', ';
-    code += this.end ? this.end.toEmbeddedTS(shiftState(state, code)) : 'null';
+    code += self.end ? yield* self.end.toEmbeddedTS(shiftState(state, code)) : 'null';
     code += ').__forEach((';
-    code += this.item ? this.item.toEmbeddedTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += self.item ? yield* self.item.toEmbeddedTS(shiftState(state, code), true) : '__IDENTIFIER__';
     code += ', ';
-    code += this.index ? this.index.toEmbeddedTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += self.index ? yield* self.index.toEmbeddedTS(shiftState(state, code), true) : '__IDENTIFIER__';
     code += ') => {\n';
-    if (Array.isArray(this.body)) {
-      this.body.forEach((logicItem) => {
-        code += `${logicItem.toEmbeddedTS(
+    if (Array.isArray(self.body)) {
+      yield* wrapForEach(self.body, function* warpForEachGenerator(logicItem) {
+        code += `${yield* logicItem.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 1,
           }),
@@ -571,7 +588,6 @@ export class ForEachStatement extends LogicItem {
       });
     }
     code += `${indent(state?.tabSize || 0)}})\n`;
-
     return code;
   }
 

package/src/concepts/FrontendLibrary__.ts

@@ -98,7 +98,7 @@ export class FrontendLibrary extends BaseNode {
 
   getLogicExistingNames(excludedList: Array<Logic> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, true);
@@ -253,7 +253,7 @@ export class FrontendLibrary extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.viewComponents as ViewComponent[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getViewComponentUniqueName(name = 'viewComponent1') {
     return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
@@ -445,12 +445,16 @@ export class FrontendLibrary extends BaseNode {
       // @ts-ignore
       const n = logic.__v_raw || logic;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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;
@@ -497,12 +501,16 @@ export class FrontendLibrary extends BaseNode {
       // @ts-ignore
       const n = viewComponent.__v_raw || viewComponent;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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/Frontend__.ts

@@ -1,4 +1,14 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import type { EmbeddedTSFileGenerator } from '../utils';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { AssetsInfo } from './App__';
 import Namespace from './Namespace__';
 import Variable from './Variable__';
@@ -897,9 +907,12 @@ export class Frontend 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;
@@ -950,9 +963,12 @@ export class Frontend 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;
@@ -1003,9 +1019,12 @@ export class Frontend 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;
@@ -1056,9 +1075,12 @@ export class Frontend 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;
@@ -1109,9 +1131,12 @@ export class Frontend 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;
@@ -1192,21 +1217,22 @@ export class Frontend extends BaseNode {
     return `/embedded/${this.rootNode?.name || this.parentNode.name}/frontends/${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.log(err);