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

package/src/concepts/ForEachStatement__.ts

@@ -1,4 +1,5 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import TypeAnnotation from './TypeAnnotation__';
 import Identifier from './Identifier__';
 import MemberExpression from './MemberExpression__';
@@ -8,64 +9,54 @@ import MemberExpression from './MemberExpression__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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__';
 import Param from './Param__';
 
 /**
  * ForEach 循环分支
  */
-@className
 @concept('ForEach 循环分支')
-// @ts-ignore
 export class ForEachStatement extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'ForEachStatement';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'ForEachStatement';
+  @property()
+  concept: 'ForEachStatement' = 'ForEachStatement';
 
   /**
    * 循环列表
    */
   @property('LogicItem')
-  // @ts-ignore
-  each!: LogicItem;
+  each: LogicItem = undefined;
 
   /**
    * 循环项参数
    */
   @property('Param')
-  // @ts-ignore
-  item!: Param;
+  item: Param = undefined;
 
   /**
    * 循环项索引
    */
   @property('Param')
-  // @ts-ignore
-  index!: Param;
+  index: Param = undefined;
 
   /**
    * 循环开始值
    */
   @property('LogicItem')
-  // @ts-ignore
-  start!: LogicItem;
+  start: LogicItem = undefined;
 
   /**
    * 循环结束值
    */
   @property('LogicItem')
-  // @ts-ignore
-  end!: LogicItem;
+  end: LogicItem = null;
 
   /**
    * 循环体
@@ -81,6 +72,9 @@ 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;
@@ -190,7 +184,7 @@ export class ForEachStatement extends LogicItem {
           ...options,
         },
         this,
-        'body',
+        'body'
       );
     }
     this.body.splice(index, 0, logicItem);
@@ -343,7 +337,7 @@ export class ForEachStatement extends LogicItem {
   removeItemInBody(logicItem: LogicItem): void;
 
   removeItemInBody(options: LogicItem) {
-    let logicItem: LogicItem = options;
+    const logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
@@ -495,10 +489,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);
@@ -522,7 +516,7 @@ export class ForEachStatement extends LogicItem {
           logicItem.toJS(
             shiftState(state, code, {
               tabSize: 0,
-            }),
+            })
           ) + '\n';
       });
     }
@@ -532,14 +526,14 @@ export class ForEachStatement extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     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(';
@@ -557,7 +551,7 @@ export class ForEachStatement extends LogicItem {
           logicItem.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 1,
-            }),
+            })
           ) + ';\n';
       });
     }
@@ -565,12 +559,57 @@ export class ForEachStatement extends LogicItem {
 
     return code;
   }
-  //================================================================================
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    code += this.each
+      ? this.each.toNaturalTS(
+        shiftState(state, code, {
+          tabSize: 0,
+        })
+      )
+      : '__IDENTIFIER__';
+    if (['NewList', 'NewMap'].includes(this.each?.concept)) code += '\n';
+    code += '.__slice(';
+    code += this.start ? this.start.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += ', ';
+    let virtualEnd: LogicItem = this.end;
+    if (!virtualEnd && this.each) {
+      // if (['List', 'String', 'Email', 'Text', 'Map'].includes(this.each.__TypeAnnotation?.typeName)) {
+      virtualEnd = new MemberExpression({
+        object: BaseNode.from({ ...this.each.toJSON(), name: this.each.name }) as LogicItem,
+        property: new Identifier({ name: 'length' }),
+      });
+      // }
+    }
+    code += virtualEnd ? virtualEnd.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += ').__forEach((';
+    code += this.item ? this.item.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += ', ';
+    code += this.index ? this.index.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += ') => {\n';
+    if (Array.isArray(this.body)) {
+      this.body.forEach((logicItem) => {
+        code += `${logicItem.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: (state?.tabSize || 0) + 1,
+          })
+        )};\n`;
+      });
+    }
+    code += `${indent(state?.tabSize || 0)}})\n`;
+
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================
 }
 
+classMap.ForEachStatement = ForEachStatement;
 export default ForEachStatement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/FrontendLibrary__.ts

@@ -1,49 +1,43 @@
+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, 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 Logic from './Logic__';
 import ViewComponent from './ViewComponent__';
 import Module from './Module__';
 import App from './App__';
 
 /**
- * 前端库
+ * 端包
  */
-@className
-@concept('前端库')
-// @ts-ignore
+@concept('端包')
 export class FrontendLibrary extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'FrontendLibrary';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'FrontendLibrary';
+  @property()
+  concept: 'FrontendLibrary' = 'FrontendLibrary';
 
   /**
    * 名称与type保持一致
    */
   @property()
-  // @ts-ignore
-  name!: 'pc' | 'h5';
+  name: 'pc' | 'h5' = undefined;
 
   /**
    * PC/H5 端
    */
   @property()
-  // @ts-ignore
-  type!: 'pc' | 'h5';
+  type: 'pc' | 'h5' = undefined;
 
   /**
    * 逻辑列表
@@ -63,6 +57,7 @@ export class FrontendLibrary extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
@@ -74,11 +69,16 @@ export class FrontendLibrary extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<FrontendLibrary>) {
-    source = Object.assign({}, FrontendLibrary.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...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,6 +99,7 @@ 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);
   }
@@ -135,7 +136,7 @@ export class FrontendLibrary extends BaseNode {
           name: this.getLogicUniqueName(),
         },
         this,
-        'logics',
+        'logics'
       );
     } else if (typeof options === 'string') {
       logic = Logic.from(
@@ -144,7 +145,7 @@ export class FrontendLibrary extends BaseNode {
           name: options,
         },
         this,
-        'logics',
+        'logics'
       );
     } else if (options instanceof Logic) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -157,7 +158,7 @@ export class FrontendLibrary extends BaseNode {
           ...options,
         },
         this,
-        'logics',
+        'logics'
       );
     }
     this.logics.splice(index, 0, logic);
@@ -250,10 +251,9 @@ 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 +290,7 @@ export class FrontendLibrary extends BaseNode {
           name: this.getViewComponentUniqueName(),
         },
         this,
-        'viewComponents',
+        'viewComponents'
       );
     } else if (typeof options === 'string') {
       viewComponent = ViewComponent.from(
@@ -299,7 +299,7 @@ export class FrontendLibrary extends BaseNode {
           name: options,
         },
         this,
-        'viewComponents',
+        'viewComponents'
       );
     } else if (options instanceof ViewComponent) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -312,7 +312,7 @@ export class FrontendLibrary extends BaseNode {
           ...options,
         },
         this,
-        'viewComponents',
+        'viewComponents'
       );
     }
     this.viewComponents.splice(index, 0, viewComponent);
@@ -420,7 +420,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 +429,7 @@ export class FrontendLibrary extends BaseNode {
   }
 
   __removeLogic(logic: Logic) {
-    const parentKey = logic.parentKey;
+    const { parentKey } = logic;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -468,7 +468,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 +477,7 @@ export class FrontendLibrary extends BaseNode {
   }
 
   __removeViewComponent(viewComponent: ViewComponent) {
-    const parentKey = viewComponent.parentKey;
+    const { parentKey } = viewComponent;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -499,10 +499,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,14 +529,15 @@ export class FrontendLibrary extends BaseNode {
     throw new Error('无法获取命名空间，请设置 parentNode！');
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.FrontendLibrary = FrontendLibrary;
 export default FrontendLibrary;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/FrontendVariable__.ts

@@ -1,27 +1,23 @@
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 Variable from './Variable__';
 
 /**
  * 前端全局变量
  */
-@className
 @concept('前端全局变量')
-// @ts-ignore
 export class FrontendVariable extends Variable {
-  /** 类名 */
-  static readonly ConceptName = 'FrontendVariable';
-
   /**
-   * 是否开启本地缓存
+   * 本地缓存
    */
   @property()
   localCache: boolean = false;
@@ -30,17 +26,22 @@ export class FrontendVariable extends Variable {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<FrontendVariable>) {
-    source = Object.assign({}, FrontendVariable.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...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 = {
@@ -51,19 +52,20 @@ export class FrontendVariable extends Variable {
     });
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.FrontendVariable = FrontendVariable;
 export default FrontendVariable;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================