@lcap/nasl 3.3.0-beta.0 → 3.4.0-alpha.1

package/src/concepts/BinaryExpression__.ts

@@ -1,81 +1,62 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
 
 /**
  * 二元表达式
  */
-@className
 @concept('二元表达式')
-// @ts-ignore
 export class BinaryExpression extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'BinaryExpression';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'BinaryExpression';
+  @property()
+  concept: 'BinaryExpression' = 'BinaryExpression';
 
   /**
    * 左边项
    */
   @property('LogicItem')
-  // @ts-ignore
-  left!: LogicItem;
+  left: LogicItem = undefined;
 
   /**
    * 右边项
    */
   @property('LogicItem')
-  // @ts-ignore
-  right!: LogicItem;
+  right: LogicItem = undefined;
 
   /**
    * 运算符
    */
   @property()
-  // @ts-ignore
-  operator!:
-    | '+'
-    | '-'
-    | '*'
-    | '/'
-    | '%'
-    | '=='
-    | '!='
-    | '>'
-    | '<'
-    | '>='
-    | '<='
-    | '&&'
-    | '||'
-    | 'startwith'
-    | 'endwith'
-    | 'like'
-    | 'in';
+  operator: '+' | '-' | '*' | '/' | '%' | '==' | '!=' | '>' | '<' | '>=' | '<=' | '&&' | '||' | 'startwith' | 'endwith' | 'like' | 'in' = undefined;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<BinaryExpression>) {
-    source = Object.assign({}, BinaryExpression.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...BinaryExpression.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'BinaryExpression';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): BinaryExpression {
     return super.from(source, parentNode, parentKey) as BinaryExpression;
   }
@@ -113,26 +94,7 @@ export class BinaryExpression extends LogicItem {
   /**
    * 设置运算符
    */
-  setOperator(
-    operator:
-      | '+'
-      | '-'
-      | '*'
-      | '/'
-      | '%'
-      | '=='
-      | '!='
-      | '>'
-      | '<'
-      | '>='
-      | '<='
-      | '&&'
-      | '||'
-      | 'startwith'
-      | 'endwith'
-      | 'like'
-      | 'in',
-  ) {
+  setOperator(operator: '+' | '-' | '*' | '/' | '%' | '==' | '!=' | '>' | '<' | '>=' | '<=' | '&&' | '||' | 'startwith' | 'endwith' | 'like' | 'in') {
     const object = {
       operator,
     };
@@ -158,7 +120,7 @@ export class BinaryExpression extends LogicItem {
     if (typeof options === 'string') {
       left = this.left;
       if (!left) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${options}`);
       }
     } else {
       left = options;
@@ -183,7 +145,7 @@ export class BinaryExpression extends LogicItem {
     if (typeof options === 'string') {
       right = this.right;
       if (!right) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${options}`);
       }
     } else {
       right = options;
@@ -192,7 +154,7 @@ export class BinaryExpression extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const { parentKey } = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -214,10 +176,10 @@ export class BinaryExpression extends LogicItem {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   toVue(options?: ElementToVueOptions) {
     if (['startwith', 'endwith'].includes(this.operator)) {
@@ -357,16 +319,14 @@ export class BinaryExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     if (['startwith', 'endwith', 'like', 'in'].includes(this.operator)) {
       const fnName = this.operator.toUpperCase();
       let code = '';
       code += `nasl.langUtil.${fnName}(`;
       code += this.left?.toEmbeddedTS ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
       code += ', ';
-      code += this.right?.toEmbeddedTS
-        ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
-        : '__RIGHT__';
+      code += this.right?.toEmbeddedTS ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
       code += ')';
       return code;
     }
@@ -390,9 +350,7 @@ export class BinaryExpression extends LogicItem {
       code += `nasl.core.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
       code += this.left?.toEmbeddedTS ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
       code += `,`;
-      code += this.right?.toEmbeddedTS
-        ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
-        : '__RIGHT__';
+      code += this.right?.toEmbeddedTS ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
       code += ')';
       return code;
     }
@@ -404,14 +362,50 @@ export class BinaryExpression extends LogicItem {
     return code;
   }
 
-  //================================================================================
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    if (['startwith', 'endwith', 'like', 'in'].includes(this.operator)) {
+      const fnName = this.operator.toUpperCase();
+      let code = '';
+      code += `nasl.langUtil.${fnName}(`;
+      code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+      code += ', ';
+      code += this.right ? this.right.toNaturalTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+      code += ')';
+      return code;
+    }
+    if (['&&', '||', '+', '-', '*', '/', '%', '==', '!=', '>', '<', '>=', '<='].includes(this.operator)) {
+      let code = '';
+      if (this.left && this.left.concept === 'BinaryExpression') {
+        code += this.left ? `(${this.left.toNaturalTS(shiftState(state, code, { inline: true }))})` : '__LEFT__';
+      } else {
+        code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+      }
+      code += `${this.operator}`;
+      if (this.right && this.right.concept === 'BinaryExpression') {
+        code += this.right ? `(${this.right.toNaturalTS(shiftState(state, code, { inline: true }))})` : '__RIGHT__';
+      } else {
+        code += this.right ? this.right.toNaturalTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+      }
+      return code;
+    }
+
+    let code = '';
+    code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+    code += ` ${this.operator} `;
+    code += this.right ? this.right.toNaturalTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.BinaryExpression = BinaryExpression;
 export default BinaryExpression;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================