@lcap/nasl 3.3.0-alpha.1 → 3.3.0-alpha.3

package/src/concepts/TypeAnnotation__.ts

@@ -1,22 +1,9 @@
-import { v4 as uuidv4 } from 'uuid';
 import App from './App__';
 import Structure from './Structure__';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { genHash } from '../generator';
 import { firstUpperCase } from '../utils/string';
 
-//= ===============================================================================
-// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
-// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
-import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
-
-import * as utils from '../utils';
-import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
-import StructureProperty from './StructureProperty__';
-
 export enum PRIMITIVE_TYPE {
   Boolean = 'Boolean',
   Integer = 'Integer',
@@ -95,6 +82,19 @@ export function isUnion(typeAnnotation: TypeAnnotation): boolean {
   return typeAnnotation && typeAnnotation.typeKind === 'union' && typeAnnotation.typeNamespace === 'nasl.core' && typeAnnotation.typeName === 'Union';
 }
 
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+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 StructureProperty from './StructureProperty__';
+
 /**
  * 类型标注
  */
@@ -158,12 +158,10 @@ export class TypeAnnotation extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<TypeAnnotation>) {
-    // @ts-ignore
-    source = { ...TypeAnnotation.getDefaultOptions(), ...source };
+    source = Object.assign({}, TypeAnnotation.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
-
   getClassName() {
     return 'TypeAnnotation';
   }
@@ -183,7 +181,6 @@ export class TypeAnnotation extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置规则对象
    */
@@ -519,7 +516,7 @@ export class TypeAnnotation extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const { parentKey } = typeAnnotation;
+    const parentKey = typeAnnotation.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -553,7 +550,7 @@ export class TypeAnnotation extends BaseNode {
   }
 
   __removeStructureProperty(structureProperty: StructureProperty) {
-    const { parentKey } = structureProperty;
+    const parentKey = structureProperty.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -575,10 +572,13 @@ export class TypeAnnotation extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
+
+  // 兼容 long 需要显示为 long 的情况，默认 undefined
+  longNotInteger: boolean = undefined;
 
   toUI(state?: TranslatorState): string {
     return this.headTitle;
@@ -607,17 +607,15 @@ export class TypeAnnotation extends BaseNode {
   get typeKey(): string {
     if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
       return `${this.typeNamespace}.${this.typeName}`;
-    }
-    if (this.typeKind === 'generic') {
+    } else if (this.typeKind === 'generic') {
       return `${this.typeNamespace}.${this.typeName}<${(this.typeArguments || []).map((arg) => arg.typeKey)}>`;
-    }
-    if (this.typeKind === 'anonymousStructure') {
+    } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation.typeKey : '未知'}`).join(', ')} }`;
-    }
-    if (this.typeKind === 'union') {
+    } else if (this.typeKind === 'union') {
       return `${this.typeArguments.map((arg) => arg.typeKey).join(' | ')}`;
+    } else {
+      return this.typeName;
     }
-    return this.typeName;
   }
 
   // 排过序的类型标识
@@ -628,8 +626,7 @@ export class TypeAnnotation extends BaseNode {
         .sort(({ name: name1 }, { name: name2 }) => (name1 > name2 ? 1 : -1))
         .map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation.sortedTypeKey : '未知'}`)
         .join(', ')}}`;
-    }
-    if (this.typeKind === 'union') {
+    } else if (this.typeKind === 'union') {
       // 按返回的每个具体项排序
       return `${this.typeArguments
         .map((arg) => arg.sortedTypeKey)
@@ -662,12 +659,12 @@ export class TypeAnnotation extends BaseNode {
    */
   get headTitle(): string {
     if (this.typeKind === 'primitive') {
-      if (this.typeName === 'Long') {
+      // longNotInteger: 兼容 long 需要显示为 long 的情况，默认 undefined
+      if (this.typeName === 'Long' && !this.longNotInteger) {
         return `Integer ${PRIMITIVE_TITLE[this.typeName] || ''}`;
       }
       return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName] || ''}`;
-    }
-    if (this.typeKind === 'reference') {
+    } else if (this.typeKind === 'reference') {
       const typeNamespace = this?.typeNamespace;
       let typeTitle = this.typeName;
       if (typeNamespace && this.rootNode) {
@@ -680,19 +677,17 @@ export class TypeAnnotation extends BaseNode {
         }
       }
       return typeTitle;
-    }
-    if (this.typeKind === 'generic') {
+    } else if (this.typeKind === 'generic') {
       if (this.typeArguments && this.typeArguments.length)
         return `${this.typeName}<${(this.typeArguments || []).map((arg) => arg.headTitle || arg.name || 'T').join(', ')}>`;
-      return this.typeName;
-    }
-    if (this.typeKind === 'anonymousStructure') {
+      else return this.typeName;
+    } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation.headTitle}`).join(', ')} }`;
-    }
-    if (this.typeKind === 'union') {
+    } else if (this.typeKind === 'union') {
       return `${this.typeArguments.map((arg) => arg.typeTitle || arg.name).join(' 或 ')}`;
+    } else {
+      return this.typeName;
     }
-    return this.typeName;
   }
 
   /**
@@ -704,20 +699,17 @@ export class TypeAnnotation extends BaseNode {
         return `Integer ${PRIMITIVE_TITLE[this.typeName] || ''}`;
       }
       return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName] || ''}`;
-    }
-    if (this.typeKind === 'reference') {
+    } else if (this.typeKind === 'reference') {
       return this.typeName;
-    }
-    if (this.typeKind === 'generic') {
+    } else if (this.typeKind === 'generic') {
       return `${this.typeName}<${!this.typeArguments.length ? 'T' : this.typeArguments.map((arg) => arg.typeTitle || arg.name || 'T').join(', ')}>`;
-    }
-    if (this.typeKind === 'anonymousStructure') {
+    } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation.typeTitle : '未知'}`).join(', ')} }`;
-    }
-    if (this.typeKind === 'union') {
+    } else if (this.typeKind === 'union') {
       return `${this.typeArguments.map((arg) => arg.typeTitle || arg.name).join(' 或 ')}`;
+    } else {
+      return this.typeName;
     }
-    return this.typeName;
   }
 
   /**
@@ -729,23 +721,21 @@ export class TypeAnnotation extends BaseNode {
         return 'Integer';
       }
       return this.typeName;
-    }
-    if (this.typeKind === 'reference') {
+    } else if (this.typeKind === 'reference') {
       return this.typeName;
-    }
-    if (this.typeKind === 'generic') {
-      return `${this.typeName}<${!this.typeArguments.length ? 'T' : this.typeArguments.map((arg) => arg.typeInlineTitle || arg.name || 'T').join(', ')
-        }>`;
-    }
-    if (this.typeKind === 'anonymousStructure') {
+    } else if (this.typeKind === 'generic') {
+      return `${this.typeName}<${
+        !this.typeArguments.length ? 'T' : this.typeArguments.map((arg) => arg.typeInlineTitle || arg.name || 'T').join(', ')
+      }>`;
+    } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties
         ?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation.typeInlineTitle : '未知'}`)
         .join(', ')} }`;
-    }
-    if (this.typeKind === 'union') {
+    } else if (this.typeKind === 'union') {
       return `${this.typeArguments.map((arg) => arg.typeInlineTitle || arg.name).join(' 或 ')}`;
+    } else {
+      return this.typeName;
     }
-    return this.typeName;
   }
 
   /**
@@ -754,22 +744,19 @@ export class TypeAnnotation extends BaseNode {
   get typeChineseTitle(): string {
     if (this.typeKind === 'primitive') {
       return `${PRIMITIVE_TITLE[this.typeName] || ''}`;
-    }
-    if (this.typeKind === 'reference') {
+    } else if (this.typeKind === 'reference') {
       return this.typeName;
-    }
-    if (this.typeKind === 'generic') {
+    } else if (this.typeKind === 'generic') {
       return `${this.typeName}<${this.typeArguments.map((arg) => arg.typeChineseTitle || arg.name || 'T').join(', ')}>`;
-    }
-    if (this.typeKind === 'anonymousStructure') {
+    } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties
         ?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation.typeChineseTitle : '未知'}`)
         .join(', ')} }`;
-    }
-    if (this.typeKind === 'union') {
+    } else if (this.typeKind === 'union') {
       return `${this.typeArguments.map((arg) => arg.typeChineseTitle || arg.name).join(' 或 ')}`;
+    } else {
+      return this.typeName;
     }
-    return this.typeName;
   }
 
   get typeTitleList() {
@@ -810,26 +797,68 @@ export class TypeAnnotation extends BaseNode {
 
   static createPrimitive(typeName: string, source?: Partial<TypeAnnotation>) {
     if ((PRIMITIVE_TYPE as any)[typeName]) {
-      return this.from({ typeKind: typeName === 'Union' ? 'union' : 'primitive', typeName, typeNamespace: 'nasl.core', ...source });
+      return this.from(
+        Object.assign(
+          {
+            typeKind: typeName === 'Union' ? 'union' : 'primitive',
+            typeName,
+            typeNamespace: 'nasl.core',
+          },
+          source
+        )
+      );
     }
   }
 
   static createReference(typeName: string, source?: Partial<TypeAnnotation>) {
-    return this.from({ typeKind: 'reference', typeName, typeNamespace: 'nasl.core', ...source });
+    return this.from(
+      Object.assign(
+        {
+          typeKind: 'reference',
+          typeName,
+          typeNamespace: 'nasl.core',
+        },
+        source
+      )
+    );
   }
 
   static createGeneric(typeName: string, source?: Partial<TypeAnnotation>) {
-    return this.from({ typeKind: 'generic', typeName, typeNamespace: 'nasl.collection', ...source });
+    return this.from(
+      Object.assign(
+        {
+          typeKind: 'generic',
+          typeName,
+          typeNamespace: 'nasl.collection',
+        },
+        source
+      )
+    );
   }
 
   static createTypeParam(typeName: string, source?: Partial<TypeAnnotation>) {
-    return this.from({ typeKind: 'typeParam', typeName, ...source });
+    return this.from(
+      Object.assign(
+        {
+          typeKind: 'typeParam',
+          typeName,
+        },
+        source
+      )
+    );
   }
 
   static createTypeAnonymousStructure(properties: Array<StructureProperty>, source?: Partial<TypeAnnotation>) {
-    return this.from({ typeKind: 'anonymousStructure', properties, ...source });
+    return this.from(
+      Object.assign(
+        {
+          typeKind: 'anonymousStructure',
+          properties,
+        },
+        source
+      )
+    );
   }
-
   /**
    * 设置类型属性名称
    */
@@ -873,14 +902,13 @@ export class TypeAnnotation extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
       if (this.typeKind === 'reference' && this.typeNamespace && this.typeNamespace.endsWith('enums')) {
         return `${this.tsCalleeNamespace}.${this.typeName}`;
       }
       return `${this.tsCalleeNamespace}.${this.typeName}`;
-    }
-    if (this.typeKind === 'generic') {
+    } else if (this.typeKind === 'generic') {
       let code = `${this.tsCalleeNamespace}.${this.typeName}<`;
       (this.typeArguments || []).forEach((arg, index) => {
         code += arg.toEmbeddedTS(shiftState(state, code, { inline: true }));
@@ -888,16 +916,14 @@ export class TypeAnnotation extends BaseNode {
       });
       code += '>';
       return code;
-    }
-    if (this.typeKind === 'union') {
+    } else if (this.typeKind === 'union') {
       let code = '';
       (this.typeArguments || []).forEach((arg, index) => {
         code += arg.toEmbeddedTS(shiftState(state, code, { inline: true }));
         if (index !== this.typeArguments.length - 1) code += ' | ';
       });
       return code;
-    }
-    if (this.typeKind === 'anonymousStructure') {
+    } else if (this.typeKind === 'anonymousStructure') {
       let code = `{ `;
       (this.properties || []).forEach((property, i) => {
         code += `${property.name}: `;
@@ -910,18 +936,19 @@ export class TypeAnnotation extends BaseNode {
       code += `__name: "AStructure_${this.hash}" `;
       code += ' }';
       return code;
+    } else {
+      if (this.tsCalleeNamespace && this.typeName) {
+        return `${this.tsCalleeNamespace}.${this.typeName}`;
+      } else if (this.typeName) {
+        return this.typeName;
+      } else {
+        return '__IDENTIFIER__';
+      }
     }
-    if (this.tsCalleeNamespace && this.typeName) {
-      return `${this.tsCalleeNamespace}.${this.typeName}`;
-    }
-    if (this.typeName) {
-      return this.typeName;
-    }
-    return '__IDENTIFIER__';
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
       if (this.typeKind === 'reference' && this.typeNamespace && this.typeNamespace.endsWith('enums')) {
         return this.tsCalleeNamespace.startsWith('nasl.ui') ? `${this.tsCalleeNamespace}.${this.typeName}` : `${this.typeName}`;
@@ -971,8 +998,7 @@ export class TypeAnnotation extends BaseNode {
   get anonymousStructureTypeDesc(): string {
     if (this.typeKind === 'generic') {
       return `${this.typeName}<${this.typeArguments.map((arg) => arg.anonymousStructureTypeDesc || arg.name || 'T').join(', ')}>`;
-    }
-    if (this.typeKind === 'anonymousStructure') {
+    } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${[...this.properties]
         .sort(({ name: aName }, { name: bName }) => {
           if (aName > bName) return 1;
@@ -980,8 +1006,9 @@ export class TypeAnnotation extends BaseNode {
         })
         .map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation.anonymousStructureTypeDesc : '未知'}`)
         .join(', ')} }`;
+    } else {
+      return this.typeName;
     }
-    return this.typeName;
   }
 
   /**
@@ -996,12 +1023,14 @@ export class TypeAnnotation extends BaseNode {
     if (this.typeKind === 'primitive') {
       if (this.typeName === 'String') {
         code = `   new nasl.core.String("${value}") `;
-      } else if (['Text'].includes(this.typeName)) {
-        code = `  new ${this.typeNamespace}.${this.typeName}("${value}")`;
-      } else if (['Boolean'].includes(this.typeName)) {
-        code = value;
       } else {
-        code = ` new ${this.typeNamespace}.${this.typeName}(${value})`;
+        if (['Text'].includes(this.typeName)) {
+          code = `  new ${this.typeNamespace}.${this.typeName}("${value}")`;
+        } else if (['Boolean'].includes(this.typeName)) {
+          code = value;
+        } else {
+          code = ` new ${this.typeNamespace}.${this.typeName}(${value})`;
+        }
       }
     } else {
       code = ` ${this.typeNamespace}.${this.typeName}['${value}']`;
@@ -1024,20 +1053,15 @@ export class TypeAnnotation extends BaseNode {
       const BooleanReg = /(false|true|\u662f|\u5426)/i;
       if (EmailReg.test(code)) {
         return this.createPrimitive('String');
-      }
-      if (TimeReg.test(code)) {
+      } else if (TimeReg.test(code)) {
         return this.createPrimitive('Time');
-      }
-      if (BooleanReg.test(code)) {
+      } else if (BooleanReg.test(code)) {
         return this.createPrimitive('Boolean');
-      }
-      if (DateReg.test(code)) {
+      } else if (DateReg.test(code)) {
         return this.createPrimitive('Date');
-      }
-      if (DateTimeReg.test(code)) {
+      } else if (DateTimeReg.test(code)) {
         return this.createPrimitive('DateTime');
-      }
-      if (!isNaN(Number(code))) {
+      } else if (!isNaN(Number(code))) {
         if (code.indexOf('.') !== -1) {
           return this.createPrimitive('Decimal');
           // return this.createPrimitive('Decimal');
@@ -1046,15 +1070,14 @@ export class TypeAnnotation extends BaseNode {
           return this.createPrimitive('Long');
         }
         return this.createPrimitive('Long');
-      }
-      if (code.length > 255) {
+      } else if (code.length > 255) {
         return this.createPrimitive('String');
       }
       return this.createPrimitive('String');
+    } else {
+      return this.createPrimitive('Long');
     }
-    return this.createPrimitive('Long');
   }
-
   // 增加插入泛型子类型
   typeArgumentsPush(typeItem: TypeAnnotation) {
     if (typeItem instanceof TypeAnnotation) {
@@ -1072,12 +1095,11 @@ export class TypeAnnotation extends BaseNode {
     const namespaceType = this.typeNamespace?.split('.').pop();
     return ['Map', 'List'].includes(this.typeName) || (this.typeKind === 'reference' && ['entities', 'structures'].includes(namespaceType));
   }
-
   /*  类型签名 */
   get sign() {
     let str: string = '';
     if (['Map', 'List'].includes(this.typeName)) {
-      str += `${this.typeName}<`;
+      str += this.typeName + '<';
       (this.typeArguments || []).forEach((item, index) => {
         str += item.sign;
         if (index + 1 !== this.typeArguments.length) {
@@ -1114,8 +1136,7 @@ export class TypeAnnotation extends BaseNode {
       if (item && item.concept === 'TypeAnnotation') {
         if (item.typeKind === 'anonymousStructure') {
           return item.properties.some((prop) => traverseChild(prop.typeAnnotation, cb));
-        }
-        if (item.typeArguments && ['generic', 'union'].includes(item.typeKind)) {
+        } else if (item.typeArguments && ['generic', 'union'].includes(item.typeKind)) {
           return item.typeArguments.some((arg) => traverseChild(arg, cb));
         }
       }
@@ -1123,14 +1144,13 @@ export class TypeAnnotation extends BaseNode {
     let result = false;
     traverseChild(this, (node: TypeAnnotation) => {
       if (node.typeNamespace?.endsWith('.structures')) {
-        const structure = this.rootNode.findNodeByCompleteName(`${node.typeNamespace}.${node.typeName}`);
+        const structure = this.rootNode.findNodeByCompleteName(node.typeNamespace + '.' + node.typeName);
         const res = !structure.properties.some((prop: StructureProperty) => prop.typeAnnotation.hasSystemType());
         if (res === false) {
           result = true;
         }
         return res;
-      }
-      if (disableTypeNamespaces.includes(node.typeNamespace)) {
+      } else if (disableTypeNamespaces.includes(node.typeNamespace)) {
         result = true;
         return false;
       }
@@ -1138,15 +1158,15 @@ export class TypeAnnotation extends BaseNode {
     return result;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
 classMap.TypeAnnotation = TypeAnnotation;
 export default TypeAnnotation;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/TypeParam__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 
 //= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -61,7 +61,7 @@ export class TypeParam extends BaseNode {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState, prefix?: string): string {
+  toNaturalTS(state = createCompilerState(), prefix?: string): string {
     return this.name;
   }
 

package/src/concepts/UnaryExpression__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
 //= ===============================================================================
@@ -153,7 +153,7 @@ export class UnaryExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     if (this.operator === 'isNull') {
       const fnName = this.operator.toUpperCase();
       let code = '';
@@ -173,7 +173,7 @@ export class UnaryExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     if (this.operator === 'isNull') {
       let code = '((';
       code += this.argument?.toNaturalTS ? this.argument.toNaturalTS(shiftState(state, '', { inline: true })) : '__IDENTIFIER__';