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

package/src/concepts/Assignment__.ts

@@ -1,4 +1,5 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import Identifier from './Identifier__';
 import { ElementToVueOptions } from './ViewElement__';
 import BatchAssignment from './BatchAssignment__';
@@ -6,33 +7,28 @@ import SelectMembers from './SelectMembers__';
 import AssignmentLine from './AssignmentLine__';
 import Logic from './Logic__';
 import MemberExpression from './MemberExpression__';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 Assignment extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'Assignment';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Assignment';
+  @property()
+  concept: 'Assignment' = 'Assignment';
 
   /**
    * 赋值语句标题
@@ -44,25 +40,29 @@ export class Assignment extends LogicItem {
    * 左边项
    */
   @property('LogicItem')
-  // @ts-ignore
-  left!: LogicItem;
+  left: LogicItem = undefined;
 
   /**
    * 右边项
    */
   @property('LogicItem')
-  // @ts-ignore
-  right!: LogicItem;
+  right: LogicItem = undefined;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Assignment>) {
-    source = Object.assign({}, Assignment.getDefaultOptions(), source);
+    // @ts-ignore
+    // @ts-ignore
+    source = { ...Assignment.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Assignment';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Assignment {
     return super.from(source, parentNode, parentKey) as Assignment;
   }
@@ -114,7 +114,7 @@ export class Assignment extends LogicItem {
     if (typeof options === 'string') {
       left = this.left;
       if (!left) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${options}`);
       }
     } else {
       left = options;
@@ -139,7 +139,7 @@ export class Assignment extends LogicItem {
     if (typeof options === 'string') {
       right = this.right;
       if (!right) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${options}`);
       }
     } else {
       right = options;
@@ -148,7 +148,7 @@ export class Assignment extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const { parentKey } = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -170,10 +170,10 @@ export class Assignment extends LogicItem {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   public static getDefaultOptions() {
     return {
@@ -189,7 +189,7 @@ export class Assignment extends LogicItem {
     let index;
     const leftMembers = [];
     // 左边变量变换
-    let leftObject: any = this.left?.toJSON?.() ?? {};
+    let leftObject: any = { ...this.left };
     if (leftObject.concept === 'MemberExpression') {
       while (leftObject.object) {
         leftMembers.unshift(leftObject);
@@ -198,11 +198,8 @@ export class Assignment extends LogicItem {
     }
     // 右边变量变换
     const rightMembers = [];
-    let rightObject: any = this.right?.toJSON?.() ?? {};
-    if (
-      rightObject.concept === 'MemberExpression' &&
-      (this.right as MemberExpression).lastObject.concept === 'Identifier'
-    ) {
+    let rightObject: any = { ...this.right };
+    if (rightObject.concept === 'MemberExpression' && (this.right as MemberExpression).lastObject.concept === 'Identifier') {
       while (rightObject.object) {
         rightMembers.unshift(rightObject);
         rightObject = { ...rightObject.object };
@@ -226,15 +223,15 @@ export class Assignment extends LogicItem {
     });
     const batchObject = this.right
       ? {
-          left: leftSelect,
-          rights: [rightSelect],
-          assignmentLines: [assignmentLine],
-        }
+        left: leftSelect,
+        rights: [rightSelect],
+        assignmentLines: [assignmentLine],
+      }
       : {
-          left: leftSelect,
-          rights: [],
-          assignmentLines: [],
-        };
+        left: leftSelect,
+        rights: [],
+        assignmentLines: [],
+      };
     const batchAssignment = new BatchAssignment({
       ...batchObject,
       offsetX: this.offsetX,
@@ -254,8 +251,7 @@ export class Assignment extends LogicItem {
     } else {
       index = parentNode[parentKey].findIndex((item: any) => item === this);
       const firstUpperText = parentKey[0].toUpperCase() + parentKey.slice(1, parentKey.length);
-      if (parentNode[`insertItemIn${firstUpperText}At`])
-        parentNode[`insertItemIn${firstUpperText}At`](batchAssignment, index);
+      if (parentNode[`insertItemIn${firstUpperText}At`]) parentNode[`insertItemIn${firstUpperText}At`](batchAssignment, index);
       else parentNode.insertItemAt(batchAssignment, index);
     }
     this.delete();
@@ -289,43 +285,51 @@ export class Assignment extends LogicItem {
       code += this.right.toJS(
         shiftState(state, code, {
           inline: true,
-        }),
+        })
       );
     }
     return code;
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = 'nasl.core.assign(';
 
     code += this.left ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
     code += ',';
     // 因为右侧枚举要赋值就得new 一下；
-    if (
-      this.right &&
-      this.right instanceof Identifier &&
-      this.right.namespace &&
-      this.right.namespace.endsWith('enums')
-    ) {
+    if (this.right && this.right instanceof Identifier && this.right.namespace && this.right.namespace.endsWith('enums')) {
       code += 'new ';
     }
-    code +=
-      this.right && this.right.toEmbeddedTS
-        ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
-        : '__RIGHT__';
+    code += this.right && this.right.toEmbeddedTS ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
     code += ');';
     return code;
   }
 
-  //================================================================================
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+
+    code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+    code += ' = ';
+    // 因为右侧枚举要赋值就得new 一下；
+    if (this.right && this.right instanceof Identifier && this.right.namespace && this.right.namespace.endsWith('enums')) {
+      code += 'new ';
+    }
+    code += (this.right && this.right.toNaturalTS) ? this.right.toNaturalTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Assignment = Assignment;
 export default Assignment;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/Attribute__.ts

@@ -1,13 +1,14 @@
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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';
 import TypeAnnotation from './TypeAnnotation__';
 import ViewComponent from './ViewComponent__';
 import Module from './Module__';
@@ -16,88 +17,73 @@ import App from './App__';
 /**
  * 组件属性
  */
-@className
 @concept('组件属性')
-// @ts-ignore
 export class Attribute extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Attribute';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Attribute';
+  @property()
+  concept: 'Attribute' = 'Attribute';
 
   /**
    * 组件属性名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * 组件属性分组
    */
   @property()
-  // @ts-ignore
-  group!: string;
+  group: string = undefined;
 
   /**
    * 组件属性标题
    */
   @property()
-  // @ts-ignore
-  title!: string;
+  title: string = undefined;
 
   /**
    * 组件属性描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 类型
    */
   @property('TypeAnnotation')
-  // @ts-ignore
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation = undefined;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
-  required!: boolean;
+  required: boolean = undefined;
 
   /**
    * 默认值
    */
   @property()
-  // @ts-ignore
-  defaultValue!: string;
+  defaultValue: string = undefined;
 
   /**
    * 是否支持双向绑定
    */
   @property()
-  // @ts-ignore
-  sync!: boolean;
+  sync: boolean = undefined;
 
   /**
    * 是否为高级功能，不在低代码中显示
    */
   @property()
-  // @ts-ignore
-  advanced!: boolean;
+  advanced: boolean = undefined;
 
   /**
    * options
    */
   @property()
-  // @ts-ignore
-  options!: Array<{ value: string; title: string }>;
+  options: Array<{ value: string; title: string }> = undefined;
 
   /**
    * 祖先 ViewComponent
@@ -105,12 +91,14 @@ export class Attribute extends BaseNode {
   get viewComponent() {
     return this.getAncestor('ViewComponent') as ViewComponent;
   }
+
   /**
    * 祖先 Module
    */
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
@@ -122,11 +110,16 @@ export class Attribute extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Attribute>) {
-    source = Object.assign({}, Attribute.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Attribute.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Attribute';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Attribute {
     return super.from(source, parentNode, parentKey) as Attribute;
   }
@@ -160,7 +153,7 @@ export class Attribute extends BaseNode {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
+        throw new Error(`找不到类型标注 ${options}`);
       }
     } else {
       typeAnnotation = options;
@@ -169,7 +162,7 @@ export class Attribute extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const { parentKey } = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -191,10 +184,10 @@ export class Attribute extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   @excludedInJSON()
   @property()
@@ -203,14 +196,15 @@ export class Attribute extends BaseNode {
     attrs?: any;
   } = undefined;
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Attribute = Attribute;
 export default Attribute;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/AuthInterface__.ts

@@ -1,43 +1,38 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import InterfaceParam from './InterfaceParam__';
 import Namespace from './Namespace__';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 Module from './Module__';
 import App from './App__';
 import Interface from './Interface__';
 
 /**
- * 鉴权接口
+ * 接口
  */
-@className
-@concept('鉴权接口')
-// @ts-ignore
+@concept('接口')
 export class AuthInterface extends Interface {
-  /** 类名 */
-  static readonly ConceptName = 'AuthInterface';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'AuthInterface';
+  @property()
+  concept: 'AuthInterface' = 'AuthInterface';
 
   /**
    * 关联的鉴权逻辑
    */
   @property()
-  // @ts-ignore
-  authLogic!: string;
+  authLogic: string = undefined;
 
   /**
    * 祖先 Module
@@ -45,6 +40,7 @@ export class AuthInterface extends Interface {
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
@@ -56,11 +52,16 @@ export class AuthInterface extends Interface {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<AuthInterface>) {
-    source = Object.assign({}, AuthInterface.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...AuthInterface.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'AuthInterface';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): AuthInterface {
     return super.from(source, parentNode, parentKey) as AuthInterface;
   }
@@ -77,18 +78,19 @@ export class AuthInterface extends Interface {
     });
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
-  //================================================================================
+  //= ===============================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.AuthInterface = AuthInterface;
 export default AuthInterface;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================