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

package/src/concepts/Function__.ts

@@ -1,18 +1,19 @@
+import { v4 as uuidv4 } from 'uuid';
 import Namespace from './Namespace__';
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import asyncFuncMap from '../common/asyncFuncMap';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 TypeParam from './TypeParam__';
 import Param from './Param__';
 import Return from './Return__';
@@ -24,32 +25,25 @@ import App from './App__';
 /**
  * 函数
  */
-@className
 @concept('函数')
-// @ts-ignore
 export class Function extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Function';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Function';
+  @property()
+  concept: 'Function' = 'Function';
 
   /**
    * 函数名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * 函数描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 类型参数列表
@@ -79,8 +73,7 @@ export class Function extends BaseNode {
    * 逻辑项
    */
   @property('LogicItem')
-  // @ts-ignore
-  returnExpression!: LogicItem;
+  returnExpression: LogicItem = undefined;
 
   /**
    * 祖先 Module
@@ -88,6 +81,7 @@ export class Function extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
@@ -99,11 +93,16 @@ export class Function extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Function>) {
-    source = Object.assign({}, Function.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Function.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Function';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Function {
     return super.from(source, parentNode, parentKey) as Function;
   }
@@ -119,6 +118,7 @@ export class Function extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置函数名称
    */
@@ -163,6 +163,7 @@ export class Function extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getTypeParamUniqueName(name = 'typeParam1') {
     return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);
   }
@@ -199,7 +200,7 @@ export class Function extends BaseNode {
           name: this.getTypeParamUniqueName(),
         },
         this,
-        'typeParams',
+        'typeParams'
       );
     } else if (typeof options === 'string') {
       typeParam = TypeParam.from(
@@ -208,7 +209,7 @@ export class Function extends BaseNode {
           name: options,
         },
         this,
-        'typeParams',
+        'typeParams'
       );
     } else if (options instanceof TypeParam) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -221,7 +222,7 @@ export class Function extends BaseNode {
           ...options,
         },
         this,
-        'typeParams',
+        'typeParams'
       );
     }
     this.typeParams.splice(index, 0, typeParam);
@@ -348,7 +349,7 @@ export class Function extends BaseNode {
           name: this.getParamUniqueName(),
         },
         this,
-        'params',
+        'params'
       );
     } else if (typeof options === 'string') {
       param = Param.from(
@@ -357,7 +358,7 @@ export class Function extends BaseNode {
           name: options,
         },
         this,
-        'params',
+        'params'
       );
     } else if (options instanceof Param) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -370,7 +371,7 @@ export class Function extends BaseNode {
           ...options,
         },
         this,
-        'params',
+        'params'
       );
     }
     this.params.splice(index, 0, param);
@@ -497,7 +498,7 @@ export class Function extends BaseNode {
           name: this.getReturnUniqueName(),
         },
         this,
-        'returns',
+        'returns'
       );
     } else if (typeof options === 'string') {
       ret = Return.from(
@@ -506,7 +507,7 @@ export class Function extends BaseNode {
           name: options,
         },
         this,
-        'returns',
+        'returns'
       );
     } else if (options instanceof Return) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -519,7 +520,7 @@ export class Function extends BaseNode {
           ...options,
         },
         this,
-        'returns',
+        'returns'
       );
     }
     this.returns.splice(index, 0, ret);
@@ -646,7 +647,7 @@ export class Function extends BaseNode {
           name: this.getVariableUniqueName(),
         },
         this,
-        'variables',
+        'variables'
       );
     } else if (typeof options === 'string') {
       variable = Variable.from(
@@ -655,7 +656,7 @@ export class Function extends BaseNode {
           name: options,
         },
         this,
-        'variables',
+        'variables'
       );
     } else if (options instanceof Variable) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -668,7 +669,7 @@ export class Function extends BaseNode {
           ...options,
         },
         this,
-        'variables',
+        'variables'
       );
     }
     this.variables.splice(index, 0, variable);
@@ -776,7 +777,7 @@ export class Function extends BaseNode {
     if (typeof options === 'string') {
       typeParam = (this.typeParams as TypeParam[]).find((item) => item.name === options);
       if (!typeParam) {
-        throw new Error('找不到类型参数 ' + options);
+        throw new Error(`找不到类型参数 ${options}`);
       }
     } else {
       typeParam = options;
@@ -785,7 +786,7 @@ export class Function extends BaseNode {
   }
 
   __removeTypeParam(typeParam: TypeParam) {
-    const parentKey = typeParam.parentKey;
+    const { parentKey } = typeParam;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -824,7 +825,7 @@ export class Function extends BaseNode {
     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;
@@ -833,7 +834,7 @@ export class Function extends BaseNode {
   }
 
   __removeParam(param: Param) {
-    const parentKey = param.parentKey;
+    const { parentKey } = param;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -872,7 +873,7 @@ export class Function extends BaseNode {
     if (typeof options === 'string') {
       ret = (this.returns as Return[]).find((item) => item.name === options);
       if (!ret) {
-        throw new Error('找不到输出参数 ' + options);
+        throw new Error(`找不到输出参数 ${options}`);
       }
     } else {
       ret = options;
@@ -881,7 +882,7 @@ export class Function extends BaseNode {
   }
 
   __removeReturn(ret: Return) {
-    const parentKey = ret.parentKey;
+    const { parentKey } = ret;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -920,7 +921,7 @@ export class Function extends BaseNode {
     if (typeof options === 'string') {
       variable = (this.variables as Variable[]).find((item) => item.name === options);
       if (!variable) {
-        throw new Error('找不到变量 ' + options);
+        throw new Error(`找不到变量 ${options}`);
       }
     } else {
       variable = options;
@@ -929,7 +930,7 @@ export class Function extends BaseNode {
   }
 
   __removeVariable(variable: Variable) {
-    const parentKey = variable.parentKey;
+    const { parentKey } = variable;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -968,7 +969,7 @@ export class Function extends BaseNode {
     if (typeof options === 'string') {
       returnExpression = this.returnExpression;
       if (!returnExpression) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${options}`);
       }
     } else {
       returnExpression = options;
@@ -977,7 +978,7 @@ export class Function extends BaseNode {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const { parentKey } = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -999,10 +1000,10 @@ export class Function extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   toJS(state?: TranslatorState): String {
     const grandParent = this.parentNode?.parentNode as any;
@@ -1031,9 +1032,7 @@ export class Function extends BaseNode {
 
   getVarExistingNames(excludedList: Array<Param | Return | Variable> = []) {
     const excludedSet = new Set(excludedList);
-    return [...this.params, ...this.returns, ...this.variables]
-      .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+    return [...this.params, ...this.returns, ...this.variables].filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
 
   getNamespace(): string {
@@ -1048,7 +1047,7 @@ export class Function extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     if (this.returnExpression) {
       code += `(`;
@@ -1064,9 +1063,35 @@ export class Function extends BaseNode {
       code += ` => (`;
 
       if (this.returnExpression) {
-        code +=
-          this.returnExpression.toEmbeddedTS &&
-          this.returnExpression.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+        code += this.returnExpression.toEmbeddedTS && this.returnExpression.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+      }
+      code += `${indent(state.tabSize)})`;
+    } else {
+      code += '__IDENTIFIER__';
+    }
+
+    return code;
+  }
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    if (this.returnExpression) {
+      code += `(`;
+      this.params.forEach((param, index) => {
+        code += param.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.params.length - 1)
+          code += ', ';
+      });
+      code += `)`;
+      if (this.returns.length) {
+        code += ': ';
+        code += this.returns[0].typeAnnotation?.toNaturalTS(shiftState(state, code, { inline: true }));
+      }
+      code += ` => (`;
+
+      if (this.returnExpression) {
+        code += this.returnExpression.toNaturalTS && this.returnExpression.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
       }
       code += `${indent(state.tabSize)})`;
     } else {
@@ -1130,14 +1155,15 @@ export class Function extends BaseNode {
     return `${calleeNamespace}.${calleeName}`;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Function = Function;
 export default Function;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/Identifier__.ts

@@ -1,67 +1,66 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 import { BindAttribute, CallLogic, TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import { findConceptKeyWordByNamespace } from '../utils';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 Identifier extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'Identifier';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Identifier';
+  @property()
+  concept: 'Identifier' = 'Identifier';
 
   /**
-   * 命名空间
+   * namespace
    */
   @property()
-  // @ts-ignore
-  namespace!: string;
+  namespace: string = undefined;
 
   /**
    * 标识符名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Identifier>) {
-    source = Object.assign({}, Identifier.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Identifier.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Identifier';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Identifier {
     return super.from(source, parentNode, parentKey) as Identifier;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   // 选中的数据类型，这个用作暂存
   typeAnnotation: TypeAnnotation = undefined;
@@ -173,12 +172,17 @@ export class Identifier extends LogicItem {
     this.view?.logics?.forEach((logics) => {
       dataMap[logics.name] = true;
     });
-    const { parentNode, namespace, jsName: name } = this;
+    const { parentNode } = this;
     let isMemberExpressionProperty = false;
     if (parentNode?.concept === 'MemberExpression' && this.parentKey === 'property') {
       isMemberExpressionProperty = true;
     }
+    const name = this.jsName;
+    const { namespace } = this;
 
+    if (name === 'UserStatusEnum') {
+      console.log(this);
+    }
     return (
       (dataMap[name] ||
         this.globalDataMap[name] ||
@@ -197,7 +201,7 @@ export class Identifier extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     // 只有data-source可以是函数 ，也可能是属性
     if (this.parentNode instanceof BindAttribute && this.parentNode.name === 'data-source') {
       const { view } = this;
@@ -231,19 +235,11 @@ export class Identifier extends LogicItem {
     }
     const logicAncestor = this.getAncestor('CallLogic') as CallLogic;
 
-    if (
-      logicAncestor &&
-      logicAncestor.calleeName === 'getCustomConfig' &&
-      logicAncestor.calleeNamespace === 'nasl.configuration'
-    ) {
+    if (logicAncestor && logicAncestor.calleeName === 'getCustomConfig' && logicAncestor.calleeNamespace === 'nasl.configuration') {
       if (this.view) {
-        return this.namespace
-          ? `${this.namespace}.Custom${this.name}.FrontEnd${this.name}`
-          : this.name || '__IDENTIFIER__';
+        return this.namespace ? `${this.namespace}.Custom${this.name}.FrontEnd${this.name}` : this.name || '__IDENTIFIER__';
       }
-      return this.namespace
-        ? `${this.namespace}.Custom${this.name}.BackEnd${this.name}`
-        : this.name || '__IDENTIFIER__';
+      return this.namespace ? `${this.namespace}.Custom${this.name}.BackEnd${this.name}` : this.name || '__IDENTIFIER__';
     }
     return this.namespace ? `${this.namespace}.${this.name}` : this.name || '__IDENTIFIER__';
   }
@@ -311,14 +307,15 @@ export class Identifier extends LogicItem {
     });
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Identifier = Identifier;
 export default Identifier;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================