@lcap/nasl 3.3.0-alpha.3 → 3.3.0-beta.0

package/src/concepts/Anchor__.ts

@@ -1,50 +1,50 @@
-import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import StringLiteral from './StringLiteral__';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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 LogicItem from './LogicItem__';
 
 /**
  * 锚点参数
  */
+@className
 @concept('锚点参数')
+// @ts-ignore
 export class Anchor extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'Anchor';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'Anchor' = 'Anchor';
+  // @ts-ignore
+  readonly concept!: 'Anchor';
 
   /**
    * 参数值
    */
   @property('LogicItem')
-  expression: LogicItem = undefined;
+  // @ts-ignore
+  expression!: LogicItem;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Anchor>) {
-    // @ts-ignore
-    source = { ...Anchor.getDefaultOptions(), ...source };
+    source = Object.assign({}, Anchor.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'Anchor';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): Anchor {
     return super.from(source, parentNode, parentKey) as Anchor;
   }
@@ -81,7 +81,7 @@ export class Anchor extends LogicItem {
     if (typeof options === 'string') {
       expression = this.expression;
       if (!expression) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       expression = options;
@@ -90,7 +90,7 @@ export class Anchor extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -112,10 +112,10 @@ export class Anchor extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   toVue(options?: ElementToVueOptions) {
     return this.expression ? this.expression.toVue(options) : '';
@@ -160,29 +160,14 @@ export class Anchor extends LogicItem {
     return code;
   }
 
-  @withSourceMap()
-  toNaturalTS(state = createCompilerState(), isHaveKeyWord?: boolean): string {
-      let code = '';
-      if (isHaveKeyWord) {
-          code += `_anchor: `;
-      }
-      if (this.expression) {
-          code += (this.expression as StringLiteral).toNaturalTS(shiftState(state, code, { inline: true }), false);
-      } else {
-          code += 'undefined';
-      }
-      return code;
-  }
-
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.Anchor = Anchor;
 export default Anchor;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/AnonymousFunction__.ts

@@ -1,6 +1,5 @@
-import { v4 as uuidv4 } from 'uuid';
 import Namespace from './Namespace__';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import ForEachStatement from './ForEachStatement__';
 import NewList from './NewList__';
@@ -9,16 +8,16 @@ import MemberExpression from './MemberExpression__';
 import Entity from './Entity__';
 import asyncFuncMap from '../common/asyncFuncMap';
 
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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 Param from './Param__';
 import LogicItem from './LogicItem__';
 import TypeAnnotation from './TypeAnnotation__';
@@ -28,19 +27,25 @@ import App from './App__';
 /**
  * 匿名函数
  */
+@className
 @concept('匿名函数')
+// @ts-ignore
 export class AnonymousFunction extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'AnonymousFunction';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'AnonymousFunction' = 'AnonymousFunction';
+  // @ts-ignore
+  readonly concept!: 'AnonymousFunction';
 
   /**
    * 匿名函数描述
    */
   @property()
-  description: string = undefined;
+  // @ts-ignore
+  description!: string;
 
   /**
    * 输入参数列表
@@ -52,13 +57,15 @@ export class AnonymousFunction extends LogicItem {
    * 逻辑项
    */
   @property('LogicItem')
-  body: LogicItem = undefined;
+  // @ts-ignore
+  body!: LogicItem;
 
   /**
    * 类型
    */
   @property('TypeAnnotation')
-  typeAnnotation: TypeAnnotation = undefined;
+  // @ts-ignore
+  typeAnnotation!: TypeAnnotation;
 
   /**
    * 祖先 Module
@@ -66,7 +73,6 @@ export class AnonymousFunction extends LogicItem {
   get module() {
     return this.getAncestor('Module') as Module;
   }
-
   /**
    * 祖先 App
    */
@@ -78,16 +84,11 @@ export class AnonymousFunction extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<AnonymousFunction>) {
-    // @ts-ignore
-    source = { ...AnonymousFunction.getDefaultOptions(), ...source };
+    source = Object.assign({}, AnonymousFunction.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'AnonymousFunction';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): AnonymousFunction {
     return super.from(source, parentNode, parentKey) as AnonymousFunction;
   }
@@ -155,7 +156,7 @@ export class AnonymousFunction extends LogicItem {
           name: this.getParamUniqueName(),
         },
         this,
-        'params'
+        'params',
       );
     } else if (typeof options === 'string') {
       param = Param.from(
@@ -164,7 +165,7 @@ export class AnonymousFunction extends LogicItem {
           name: options,
         },
         this,
-        'params'
+        'params',
       );
     } else if (options instanceof Param) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -177,7 +178,7 @@ export class AnonymousFunction extends LogicItem {
           ...options,
         },
         this,
-        'params'
+        'params',
       );
     }
     this.params.splice(index, 0, param);
@@ -285,7 +286,7 @@ export class AnonymousFunction extends LogicItem {
     if (typeof options === 'string') {
       param = (this.params as Param[]).find((item) => item.name === options);
       if (!param) {
-        throw new Error(`找不到输入参数 ${options}`);
+        throw new Error('找不到输入参数 ' + options);
       }
     } else {
       param = options;
@@ -294,7 +295,7 @@ export class AnonymousFunction extends LogicItem {
   }
 
   __removeParam(param: Param) {
-    const { parentKey } = param;
+    const parentKey = param.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -333,7 +334,7 @@ export class AnonymousFunction extends LogicItem {
     if (typeof options === 'string') {
       body = this.body;
       if (!body) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       body = options;
@@ -342,7 +343,7 @@ export class AnonymousFunction extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -381,7 +382,7 @@ export class AnonymousFunction extends LogicItem {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error(`找不到类型标注 ${options}`);
+        throw new Error('找不到类型标注 ' + options);
       }
     } else {
       typeAnnotation = options;
@@ -390,7 +391,7 @@ export class AnonymousFunction extends LogicItem {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const { parentKey } = typeAnnotation;
+    const parentKey = typeAnnotation.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -412,10 +413,10 @@ export class AnonymousFunction extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   toJS(state?: TranslatorState): string {
     const grandParent = this.parentNode?.parentNode;
@@ -491,7 +492,7 @@ export class AnonymousFunction extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  toEmbeddedTS(state?: TranslatorState): string {
     let updateNoPropertyCode = '';
     const grandParent = this.parentNode?.parentNode;
     if (
@@ -509,7 +510,8 @@ export class AnonymousFunction extends LogicItem {
         const newList = expression?.body as NewList;
         const newListItems = newList?.items;
 
-        if (primaryKeys.length === newListItems?.length) updateNoPropertyCode = 'const __UpdateNoProperty__: any = null;\n';
+        if (primaryKeys.length === newListItems?.length)
+          updateNoPropertyCode = 'const __UpdateNoProperty__: any = null;\n';
       }
     }
 
@@ -528,34 +530,9 @@ export class AnonymousFunction extends LogicItem {
       code += `return `;
 
       if (this.body) {
-        code += this.body.toEmbeddedTS && this.body.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
-      }
-      code += ';';
-      code += `${indent(state.tabSize)}}`;
-    } else {
-      code += '__IDENTIFIER__';
-    }
-
-    return code;
-  }
-
-  @withSourceMap()
-  toNaturalTS(state = createCompilerState()): string {
-    let code = '';
-    if (this.body) {
-      code += `(`;
-      this.params.forEach((param, index) => {
-        code += param.toNaturalTS(shiftState(state, code, { inline: true }));
-        if (index !== this.params.length - 1)
-          code += ', ';
-      });
-      code += `)`;
-      code += ` => (`;
-
-      if (this.body) {
-        code += this.body.toNaturalTS && this.body.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+        code +=
+          this.body.toEmbeddedTS && this.body.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
       }
-      code += ')';
       code += ';';
       code += `${indent(state.tabSize)}}`;
     } else {
@@ -632,15 +609,14 @@ export class AnonymousFunction extends LogicItem {
     });
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.AnonymousFunction = AnonymousFunction;
 export default AnonymousFunction;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================