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

package/src/concepts/ForEachStatement__.ts

@@ -9,59 +9,81 @@ import MemberExpression from './MemberExpression__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
 import Param from './Param__';
 
 /**
  * ForEach 循环分支
  */
+@className
 @concept('ForEach 循环分支')
+// @ts-ignore
 export class ForEachStatement extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'ForEachStatement';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'ForEachStatement' = 'ForEachStatement';
+  // @ts-ignore
+  readonly concept!: 'ForEachStatement';
 
   /**
    * 循环列表
    */
-  @property('LogicItem')
-  each: LogicItem = undefined;
+  @property({
+    objectRef: 'LogicItem',
+  })
+  // @ts-ignore
+  each!: LogicItem;
 
   /**
    * 循环项参数
    */
-  @property('Param')
-  item: Param = undefined;
+  @property({
+    objectRef: 'Param',
+  })
+  // @ts-ignore
+  item!: Param;
 
   /**
    * 循环项索引
    */
-  @property('Param')
-  index: Param = undefined;
+  @property({
+    objectRef: 'Param',
+  })
+  // @ts-ignore
+  index!: Param;
 
   /**
    * 循环开始值
    */
-  @property('LogicItem')
-  start: LogicItem = undefined;
+  @property({
+    objectRef: 'LogicItem',
+  })
+  // @ts-ignore
+  start!: LogicItem;
 
   /**
    * 循环结束值
    */
-  @property('LogicItem')
-  end: LogicItem = null;
+  @property({
+    objectRef: 'LogicItem',
+  })
+  // @ts-ignore
+  end!: LogicItem;
 
   /**
    * 循环体
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   body: Array<LogicItem> = [];
 
   /**
@@ -72,9 +94,6 @@ export class ForEachStatement extends LogicItem {
     super(source);
     super.subConstructor(source);
   }
-  getClassName() {
-    return 'ForEachStatement';
-  }
 
   static from(source: any, parentNode?: any, parentKey?: string): ForEachStatement {
     return super.from(source, parentNode, parentKey) as ForEachStatement;
@@ -184,7 +203,7 @@ export class ForEachStatement extends LogicItem {
           ...options,
         },
         this,
-        'body'
+        'body',
       );
     }
     this.body.splice(index, 0, logicItem);
@@ -337,7 +356,7 @@ export class ForEachStatement extends LogicItem {
   removeItemInBody(logicItem: LogicItem): void;
 
   removeItemInBody(options: LogicItem) {
-    const logicItem: LogicItem = options;
+    let logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
@@ -489,10 +508,10 @@ export class ForEachStatement extends LogicItem {
     let code = '';
     const list = this.each
       ? this.each.toJS(
-        shiftState(state, code, {
-          tabSize: 0,
-        })
-      )
+          shiftState(state, code, {
+            tabSize: 0,
+          }),
+        )
       : '';
     const random = Math.random();
     const number = Math.round(random * 10000);
@@ -516,7 +535,7 @@ export class ForEachStatement extends LogicItem {
           logicItem.toJS(
             shiftState(state, code, {
               tabSize: 0,
-            })
+            }),
           ) + '\n';
       });
     }
@@ -530,10 +549,10 @@ export class ForEachStatement extends LogicItem {
     let code = '';
     code += this.each
       ? this.each.toEmbeddedTS(
-        shiftState(state, code, {
-          tabSize: 0,
-        })
-      )
+          shiftState(state, code, {
+            tabSize: 0,
+          }),
+        )
       : '__IDENTIFIER__';
     if (['NewList', 'NewMap'].includes(this.each?.concept)) code += '\n';
     code += '.__slice(';
@@ -551,7 +570,7 @@ export class ForEachStatement extends LogicItem {
           logicItem.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 1,
-            })
+            }),
           ) + ';\n';
       });
     }
@@ -609,7 +628,6 @@ export class ForEachStatement extends LogicItem {
   //================================================================================
 }
 
-classMap.ForEachStatement = ForEachStatement;
 export default ForEachStatement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/FrontendLibrary__.ts

@@ -1,54 +1,66 @@
-import { v4 as uuidv4 } from 'uuid';
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import Logic from './Logic__';
 import ViewComponent from './ViewComponent__';
 import Module from './Module__';
 import App from './App__';
 
 /**
- * 端包
+ * 前端库
  */
-@concept('端包')
+@className
+@concept('前端库')
+// @ts-ignore
 export class FrontendLibrary extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'FrontendLibrary';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'FrontendLibrary' = 'FrontendLibrary';
+  // @ts-ignore
+  readonly concept!: 'FrontendLibrary';
 
   /**
    * 名称与type保持一致
    */
   @property()
-  name: 'pc' | 'h5' = undefined;
+  // @ts-ignore
+  name!: 'pc' | 'h5';
 
   /**
    * PC/H5 端
    */
   @property()
-  type: 'pc' | 'h5' = undefined;
+  // @ts-ignore
+  type!: 'pc' | 'h5';
 
   /**
    * 逻辑列表
    */
-  @property('Logic')
+  @property({
+    objectRef: 'Logic',
+    isArray: true,
+  })
   logics: Array<Logic> = [];
 
   /**
    * 页面组件列表
    */
-  @property('ViewComponent')
+  @property({
+    objectRef: 'ViewComponent',
+    isArray: true,
+  })
   viewComponents: Array<ViewComponent> = [];
 
   /**
@@ -57,7 +69,6 @@ export class FrontendLibrary extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
-
   /**
    * 祖先 App
    */
@@ -69,16 +80,11 @@ export class FrontendLibrary extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<FrontendLibrary>) {
-    // @ts-ignore
-    source = { ...FrontendLibrary.getDefaultOptions(), ...source };
+    source = Object.assign({}, FrontendLibrary.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'FrontendLibrary';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): FrontendLibrary {
     return super.from(source, parentNode, parentKey) as FrontendLibrary;
   }
@@ -99,7 +105,6 @@ export class FrontendLibrary extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
-
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, true);
   }
@@ -136,7 +141,7 @@ export class FrontendLibrary extends BaseNode {
           name: this.getLogicUniqueName(),
         },
         this,
-        'logics'
+        'logics',
       );
     } else if (typeof options === 'string') {
       logic = Logic.from(
@@ -145,7 +150,7 @@ export class FrontendLibrary extends BaseNode {
           name: options,
         },
         this,
-        'logics'
+        'logics',
       );
     } else if (options instanceof Logic) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -158,7 +163,7 @@ export class FrontendLibrary extends BaseNode {
           ...options,
         },
         this,
-        'logics'
+        'logics',
       );
     }
     this.logics.splice(index, 0, logic);
@@ -251,9 +256,10 @@ export class FrontendLibrary extends BaseNode {
 
   getViewComponentExistingNames(excludedList: Array<ViewComponent> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.viewComponents as ViewComponent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.viewComponents as ViewComponent[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-
   getViewComponentUniqueName(name = 'viewComponent1') {
     return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
   }
@@ -290,7 +296,7 @@ export class FrontendLibrary extends BaseNode {
           name: this.getViewComponentUniqueName(),
         },
         this,
-        'viewComponents'
+        'viewComponents',
       );
     } else if (typeof options === 'string') {
       viewComponent = ViewComponent.from(
@@ -299,7 +305,7 @@ export class FrontendLibrary extends BaseNode {
           name: options,
         },
         this,
-        'viewComponents'
+        'viewComponents',
       );
     } else if (options instanceof ViewComponent) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -312,7 +318,7 @@ export class FrontendLibrary extends BaseNode {
           ...options,
         },
         this,
-        'viewComponents'
+        'viewComponents',
       );
     }
     this.viewComponents.splice(index, 0, viewComponent);
@@ -420,7 +426,7 @@ export class FrontendLibrary extends BaseNode {
     if (typeof options === 'string') {
       logic = (this.logics as Logic[]).find((item) => item.name === options);
       if (!logic) {
-        throw new Error(`找不到逻辑 ${options}`);
+        throw new Error('找不到逻辑 ' + options);
       }
     } else {
       logic = options;
@@ -429,7 +435,7 @@ export class FrontendLibrary extends BaseNode {
   }
 
   __removeLogic(logic: Logic) {
-    const { parentKey } = logic;
+    const parentKey = logic.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -468,7 +474,7 @@ export class FrontendLibrary extends BaseNode {
     if (typeof options === 'string') {
       viewComponent = (this.viewComponents as ViewComponent[]).find((item) => item.name === options);
       if (!viewComponent) {
-        throw new Error(`找不到页面组件 ${options}`);
+        throw new Error('找不到页面组件 ' + options);
       }
     } else {
       viewComponent = options;
@@ -477,7 +483,7 @@ export class FrontendLibrary extends BaseNode {
   }
 
   __removeViewComponent(viewComponent: ViewComponent) {
-    const { parentKey } = viewComponent;
+    const parentKey = viewComponent.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -499,10 +505,10 @@ export class FrontendLibrary extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   getNamespace() {
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
@@ -529,15 +535,14 @@ export class FrontendLibrary extends BaseNode {
     throw new Error('无法获取命名空间，请设置 parentNode！');
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.FrontendLibrary = FrontendLibrary;
 export default FrontendLibrary;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/FrontendVariable__.ts

@@ -1,23 +1,27 @@
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
-import { v4 as uuidv4 } from 'uuid';
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import Variable from './Variable__';
 
 /**
  * 前端全局变量
  */
+@className
 @concept('前端全局变量')
+// @ts-ignore
 export class FrontendVariable extends Variable {
+  /** 类名 */
+  static readonly ConceptName = 'FrontendVariable';
+
   /**
-   * 本地缓存
+   * 是否开启本地缓存
    */
   @property()
   localCache: boolean = false;
@@ -26,22 +30,17 @@ export class FrontendVariable extends Variable {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<FrontendVariable>) {
-    // @ts-ignore
-    source = { ...FrontendVariable.getDefaultOptions(), ...source };
+    source = Object.assign({}, FrontendVariable.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'FrontendVariable';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): FrontendVariable {
     return super.from(source, parentNode, parentKey) as FrontendVariable;
   }
 
   /**
-   * 设置本地缓存
+   * 设置是否开启本地缓存
    */
   setLocalCache(localCache: boolean) {
     const object = {
@@ -52,20 +51,19 @@ export class FrontendVariable extends Variable {
     });
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.FrontendVariable = FrontendVariable;
 export default FrontendVariable;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================