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

package/src/common/BaseNode.ts

@@ -93,7 +93,6 @@ export class BaseNode extends EventEmitter {
     }
   }
 
-
   /**
    * toJSON 时需要去除的键，为了避免出现 CircularJSON
    */
@@ -1164,7 +1163,7 @@ export class BaseNode extends EventEmitter {
    * 获取添加时的默认选项
    * @returns
    */
-  public static getDefaultOptions(): any {
+  static getDefaultOptions(): any {
     return {};
   }
 
@@ -1188,7 +1187,58 @@ export class BaseNode extends EventEmitter {
       }
     }
 
-    traverse(this as unknown as SyntaxNode);
+    traverse(this);
+  }
+
+  /**
+   * 生成器中序遍历节点
+   *
+   * @description 与`traverseChildren`不同，此方法会过滤掉非节点值
+   */
+  *traverseChildrenGenerator(cb: (node: SyntaxNode) => (void | Generator<any, any, any>)) {
+    const isNode = (node: unknown): node is SyntaxNode => {
+      return Boolean(node) && typeof node === 'object' && ('concept' in node) && typeof (node as any).concept === 'string';
+    };
+
+    function* traverse(node: BaseNode): Generator<any, any, any> {
+      if (isNode(node)) {
+        const result = cb(node);
+
+        if (utils.isGenerator(result)) {
+          yield* result;
+        }
+        else {
+          yield;
+        }
+      }
+
+      const propertyMap = getConceptPropertyMap(node?.concept);
+
+      if (!propertyMap) {
+        yield;
+        return;
+      }
+
+      for (const property of propertyMap.keys()) {
+        const prop = node[property as keyof BaseNode];
+
+        if (!prop) {
+          continue;
+        }
+        else if (Array.isArray(prop)) {
+          for (const child of prop) {
+            yield* traverse(child);
+          }
+        }
+        else {
+          yield* traverse(prop);
+        }
+      }
+
+      yield;
+    }
+
+    yield* traverse(this);
   }
 
   /**
@@ -1211,7 +1261,7 @@ export class BaseNode extends EventEmitter {
   /**
    *  获取当前节点在nasl标注节点上的节点
    */
-  public getCurrentAnnotatedJSON() {
+  getCurrentAnnotatedJSON() {
     return this.__TypeAnnotation;
   }
 
@@ -1219,7 +1269,7 @@ export class BaseNode extends EventEmitter {
    *  获取
    *  当前this上下文 的Source 和 父级文件级别的节点
    */
-  public getCurrentSource() {
+  getCurrentSource() {
     const node = this as BaseNode;
     let { sourceMap } = node;
     let fileNode = node;
@@ -1241,7 +1291,7 @@ export class BaseNode extends EventEmitter {
    *  获取
    *  当前this上下文 的Source 和 父级文件级别的节点
    */
-  public getFileConceptNode(concept: string) {
+  getFileConceptNode(concept: string) {
     const node = this as BaseNode;
     let { sourceMap } = node;
     let fileNode = node;
@@ -1340,6 +1390,17 @@ export class BaseNode extends EventEmitter {
 
     return nodes;
   }
+
+  *toEmbeddedTS(): Generator<any, string, any> {
+    return '';
+  }
+
+  /**
+   * 调试用的 ToTS 接口
+   */
+  toDebugTs() {
+    return console.log(utils.runGeneratorSync(this.toEmbeddedTS()));
+  }
 }
 
 export default BaseNode;

package/src/common/index.ts

@@ -1,3 +1,4 @@
 export * from './BaseNode';
 export * from './EventEmitter';
 export * from './Command';
+export * from './utils';

package/src/common/utils.ts

@@ -0,0 +1,17 @@
+import type { SyntaxNode } from '../concepts';
+
+export function waitOqlQueryComponentChildrenFinish(node: SyntaxNode) {
+  const needGetSourceMapOqlList: Promise<any>[] = [];
+
+  node.traverseStrictChildren((el) => {
+    if (el.concept === 'OqlQueryComponent') {
+      if (!el.codeSourceMap) {
+        needGetSourceMapOqlList.push(el.requestEmbeddedTS());
+      }
+    }
+  });
+
+  if (needGetSourceMapOqlList.length > 0) {
+    return Promise.all(needGetSourceMapOqlList);
+  }
+}

package/src/concepts/Abort__.ts

@@ -1,4 +1,11 @@
-import { TranslatorState, indent, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  withSourceMapGenerator,
+  createCompilerState,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -60,11 +67,13 @@ export class Abort extends LogicItem {
     return code;
   }
 
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
     // 中止放入表达式中，处理翻译就跳过
     // 别的就增加一个 return;
-    if (this.parentNode?.concept !== 'MatchCase') {
+    if (self.parentNode?.concept !== 'MatchCase') {
       code += 'return;';
     }
     return code;

package/src/concepts/Anchor__.ts

@@ -1,4 +1,13 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMapGenerator,
+  withSourceMap,
+  createCompilerState,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import StringLiteral from './StringLiteral__';
 //================================================================================
@@ -110,9 +119,12 @@ export class Anchor 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;
@@ -152,14 +164,15 @@ export class Anchor extends LogicItem {
     return `<span style="color: #AAAAAA">锚点 = </span><span style="color: #FFFFFF">${expr}</span>`;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState, isHaveKeyWord?: boolean): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState(), isHaveKeyWord?: boolean): TranslatorGenerator {
+    const self = this;
     let code = '';
     if (isHaveKeyWord) {
       code += `_anchor: `;
     }
-    if (this.expression) {
-      code += (this.expression as StringLiteral).toEmbeddedTS(shiftState(state, code), false);
+    if (self.expression) {
+      code += yield* (self.expression as StringLiteral).toEmbeddedTS(shiftState(state, code), false);
     } else {
       code += 'undefined';
     }

package/src/concepts/AnonymousFunction__.ts

@@ -1,5 +1,15 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 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 ForEachStatement from './ForEachStatement__';
 import NewList from './NewList__';
@@ -315,9 +325,12 @@ export class AnonymousFunction 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 +381,12 @@ export class AnonymousFunction 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;
@@ -421,9 +437,12 @@ export class AnonymousFunction 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;
@@ -507,10 +526,11 @@ export class AnonymousFunction extends LogicItem {
     throw new Error('无法获取命名空间，请设置 parentNode！');
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let updateNoPropertyCode = '';
-    const grandParent = this.parentNode?.parentNode;
+    const grandParent = self.parentNode?.parentNode;
     if (
       grandParent instanceof CallLogic &&
       /dataSources\.[^.]+\.entities\.[^.]+\.logics/.test(grandParent.calleeNamespace) &&
@@ -520,41 +540,33 @@ export class AnonymousFunction extends LogicItem {
       const entity = logicNode?.upperNode?.upperNode as Entity;
       if (entity) {
         const primaryKeys = entity.properties.filter((item) => item.primaryKey);
-
         const propertyArg = grandParent.arguments.find((item) => item.keyword === 'properties');
         const expression = propertyArg?.expression as unknown as AnonymousFunction;
         const newList = expression?.body as NewList;
         const newListItems = newList?.items;
-
         if (primaryKeys.length === newListItems?.length)
           updateNoPropertyCode = 'const __UpdateNoProperty__: any = null;\n';
       }
     }
-
     let code = '';
-    if (this.body) {
+    if (self.body) {
       code += `(`;
-      this.params.forEach((param, index) => {
-        code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));
-        if (index !== this.params.length - 1) code += ', ';
+      yield* wrapForEach(self.params, function* warpForEachGenerator(param, index) {
+        code += yield* param.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        if (index !== self.params.length - 1) code += ', ';
       });
       code += `)`;
       code += ` => {\n`;
-
       if (updateNoPropertyCode) code += updateNoPropertyCode;
-
       code += `return `;
-
-      if (this.body) {
-        code +=
-          this.body.toEmbeddedTS && this.body.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+      if (self.body?.toEmbeddedTS) {
+        code += yield* self.body.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
       }
       code += ';';
       code += `${indent(state.tabSize)}}`;
     } else {
       code += '__IDENTIFIER__';
     }
-
     return code;
   }
 
@@ -617,11 +629,13 @@ export class AnonymousFunction extends LogicItem {
     return code;
   }
 
-  toEmbeddedTSDefinition(state?: TranslatorState): string {
+  @withGenerator
+  *toEmbeddedTSDefinition(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '(';
-    this.params.forEach((param, index) => {
-      code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));
-      if (index !== this.params.length - 1) code += ', ';
+    yield* wrapForEach(self.params, function* warpForEachGenerator(param, index) {
+      code += yield* param.toEmbeddedTS(shiftState(state, code, { inline: true }));
+      if (index !== self.params.length - 1) code += ', ';
     });
     code += `) => (`;
     code += 'any';