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

package/src/concepts/Variable__.ts

@@ -1,32 +1,22 @@
+import { v4 as uuidv4 } from 'uuid';
 import { dataTypesMap } from './basics/types';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import EntityProperty from './EntityProperty__';
 import StructureProperty from './StructureProperty__';
 import Structure from './Structure__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import Namespace from './Namespace__';
-
-function tryJSONParse(str: string) {
-  let result;
-
-  try {
-    result = JSON.parse(str);
-  } catch (e) {}
-
-  return result;
-}
-
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 TypeAnnotation from './TypeAnnotation__';
 import Logic from './Logic__';
 import AuthInterface from './AuthInterface__';
@@ -39,49 +29,50 @@ import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 
+function tryJSONParse(str: string) {
+  let result;
+
+  try {
+    result = JSON.parse(str);
+  } catch (e) {}
+
+  return result;
+}
+
 /**
  * 变量
  */
-@className
 @concept('变量')
-// @ts-ignore
 export class Variable extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Variable';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Variable';
+  @property()
+  concept: 'Variable' = 'Variable';
 
   /**
    * 变量名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * 变量描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 类型
    */
   @property('TypeAnnotation')
-  // @ts-ignore
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation = undefined;
 
   /**
    * 默认值
    */
   @property()
-  // @ts-ignore
-  defaultValue!: string;
+  defaultValue: string = undefined;
 
   /**
    * 祖先 Logic
@@ -89,54 +80,63 @@ export class Variable extends BaseNode {
   get logic() {
     return this.getAncestor('Logic') as Logic;
   }
+
   /**
    * 祖先 Module
    */
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
   get app() {
     return this.getAncestor('App') as App;
   }
+
   /**
    * 祖先 Connector
    */
   get connector() {
     return this.getAncestor('Connector') as Connector;
   }
+
   /**
    * 祖先 View
    */
   get view() {
     return this.getAncestor('View') as View;
   }
+
   /**
    * 祖先 Frontend
    */
   get frontend() {
     return this.getAncestor('Frontend') as Frontend;
   }
+
   /**
    * 祖先 ProcessElement
    */
   get processElement() {
     return this.getAncestor('ProcessElement') as ProcessElement;
   }
+
   /**
    * 祖先 Process
    */
   get process() {
     return this.getAncestor('Process') as Process;
   }
+
   /**
    * 祖先 AuthInterface
    */
   get AuthLogic() {
     return this.getAncestor('AuthInterface') as AuthInterface;
   }
+
   /**
    * 祖先 AuthLogicForCallInterface
    */
@@ -148,11 +148,16 @@ export class Variable extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Variable>) {
-    source = Object.assign({}, Variable.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Variable.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Variable';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Variable {
     return super.from(source, parentNode, parentKey) as Variable;
   }
@@ -168,6 +173,7 @@ export class Variable extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置变量名称
    */
@@ -222,7 +228,7 @@ export class Variable extends BaseNode {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
+        throw new Error(`找不到类型标注 ${options}`);
       }
     } else {
       typeAnnotation = options;
@@ -231,7 +237,7 @@ export class Variable extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const { parentKey } = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -253,10 +259,10 @@ export class Variable extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   /**
    * 自动补全的属性列表
    */
@@ -274,8 +280,7 @@ export class Variable extends BaseNode {
     const context = this.view ? 'this' : 'Vue.prototype';
     const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
     const needGenInitFromSchema =
-      typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
     let code = `${this.name} =`;
     if (needGenInitFromSchema) {
       code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
@@ -307,7 +312,7 @@ export class Variable extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = this.name;
     if (this.typeAnnotation) {
       code += ': ';
@@ -324,6 +329,24 @@ export class Variable extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = this.name;
+    if (this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toNaturalTS(shiftState(state, code));
+      // toTS暂时只需要翻译引用数据类型的，因为值都是字符串
+      // 就不在这里赋值了，这里单纯就为了快速查找
+      // 并且屏蔽了一些异常的错误
+      if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
+        if (this.isEnum()) {
+          code += `= ${this.typeAnnotation.typeKey}['${this.defaultValue}']`;
+        }
+      }
+    }
+    return code;
+  }
+
   isEnum() {
     return this.typeAnnotation?.typeNamespace?.endsWith('.enums');
   }
@@ -437,14 +460,15 @@ export class Variable extends BaseNode {
   get readonly() {
     return !!this.module;
   }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Variable = Variable;
 export default Variable;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/ViewBlock__.ts

@@ -1,60 +1,58 @@
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
+import { v4 as uuidv4 } from 'uuid';
 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';
 
 /**
- * 页面代码块
+ * 代码块
  */
-@className
-@concept('页面代码块')
-// @ts-ignore
+@concept('代码块')
 export class ViewBlock extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'ViewBlock';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'ViewBlock';
+  @property()
+  concept: 'ViewBlock' = 'ViewBlock';
 
   /**
    * 描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 标题
    */
   @property()
-  // @ts-ignore
-  title!: string;
+  title: string = undefined;
 
   /**
    * 代码
    */
   @property()
-  // @ts-ignore
-  code!: string;
+  code: string = undefined;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<ViewBlock>) {
-    source = Object.assign({}, ViewBlock.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...ViewBlock.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'ViewBlock';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): ViewBlock {
     return super.from(source, parentNode, parentKey) as ViewBlock;
   }
@@ -71,19 +69,20 @@ export class ViewBlock extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.ViewBlock = ViewBlock;
 export default ViewBlock;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================