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

package/src/concepts/MemberExpression__.ts

@@ -1,4 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { Enum, TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
@@ -7,63 +6,70 @@ import BindAttribute, { attrConvertCamelCase } from './BindAttribute__';
 import Assignment from './Assignment__';
 import BatchAssignment from './BatchAssignment__';
 
-//= ===============================================================================
+const Identifier_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+
+const atrrParamsMap: Record<string, string> = {
+  page: 'pageNumber',
+  size: 'pageSize',
+  sort: 'sorting.field',
+  order: 'sorting.order',
+};
+
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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__';
 
-const Identifier_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
-
-const atrrParamsMap:Record<string, string> = {
-  page: 'pageNumber',
-  size: 'pageSize',
-  sort: 'sorting.field',
-  order: 'sorting.order'
-};
 /**
  * 成员表达式
  */
+@className
 @concept('成员表达式')
+// @ts-ignore
 export class MemberExpression extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'MemberExpression';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'MemberExpression' = 'MemberExpression';
+  // @ts-ignore
+  readonly concept!: 'MemberExpression';
 
   /**
    * 逻辑项
    */
-  @property('LogicItem')
-  object: LogicItem = undefined;
+  @property({
+    objectRef: 'LogicItem',
+  })
+  // @ts-ignore
+  object!: LogicItem;
 
   /**
    * 逻辑项
    */
-  @property('LogicItem')
-  property: LogicItem = undefined;
+  @property({
+    objectRef: 'LogicItem',
+  })
+  // @ts-ignore
+  property!: LogicItem;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<MemberExpression>) {
-    // @ts-ignore
-    source = { ...MemberExpression.getDefaultOptions(), ...source };
+    source = Object.assign({}, MemberExpression.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'MemberExpression';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): MemberExpression {
     return super.from(source, parentNode, parentKey) as MemberExpression;
   }
@@ -85,7 +91,7 @@ export class MemberExpression extends LogicItem {
     if (typeof options === 'string') {
       object = this.object;
       if (!object) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       object = options;
@@ -110,7 +116,7 @@ export class MemberExpression extends LogicItem {
     if (typeof options === 'string') {
       property = this.property;
       if (!property) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       property = options;
@@ -119,7 +125,7 @@ export class MemberExpression extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -141,73 +147,100 @@ export class MemberExpression extends LogicItem {
     return params;
   }
 
-
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   // 选中的数据类型，这个用作暂存
   typeAnnotation: TypeAnnotation = undefined;
 
   toVue(options?: ElementToVueOptions) {
     //  如果是枚举取值
-    if (this.object?.concept === 'Identifier' && (this.object as Identifier)?.isEnum() && this.property?.concept === 'Identifier') {
+    if (
+      this.object?.concept === 'Identifier' &&
+      (this.object as Identifier)?.isEnum() &&
+      this.property?.concept === 'Identifier'
+    ) {
       return `"${this.property?.name}"`;
     }
-    if (this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') && this.property?.name === 'length') {
+    if (
+      this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') &&
+      this.property?.name === 'length'
+    ) {
       return `Object.keys(${this.object?.toJS()}).length`;
     }
-    if (this.object instanceof Identifier && this.object?.namespace?.startsWith('elements.') && this.object?.namespace?.endsWith('.property')) {
-        let elementName = ''
-        if (this.object.namespace.startsWith('elements.$ce')) {
-            elementName = this.getAncestor('ViewElement')?.name
-        } else {
-            elementName = this.object.name
-        }
-        let propertyName = ''
-        let subProperty = ''
-        if (this.property instanceof Identifier) {
-            const namespace = this.property.namespace
-            const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace]
-            propertyName = namespaceList[0]
-            subProperty = namespaceList?.[1] ? `['${namespaceList?.[1]}']` : ''
-        }
-        return `this['__${elementName}_${propertyName}']${subProperty}`
-    } else if (this.object instanceof MemberExpression && this.object?.object?.name === 'elements' && this.object?.property?.name === '$ce') {
+    if (
+      this.object instanceof Identifier &&
+      this.object?.namespace?.startsWith('elements.') &&
+      this.object?.namespace?.endsWith('.property')
+    ) {
+      let elementName = '';
+      if (this.object.namespace.startsWith('elements.$ce')) {
+        elementName = this.getAncestor('ViewElement')?.name;
+      } else {
+        elementName = this.object.name;
+      }
+      let propertyName = '';
+      let subProperty = '';
+      if (this.property instanceof Identifier) {
+        const namespace = this.property.namespace;
+        const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace];
+        propertyName = namespaceList[0];
+        subProperty = namespaceList?.[1] ? `['${namespaceList?.[1]}']` : '';
+      }
+      return `this['__${elementName}_${propertyName}']${subProperty}`;
+    } else if (
+      this.object instanceof MemberExpression &&
+      this.object?.object?.name === 'elements' &&
+      this.object?.property?.name === '$ce'
+    ) {
       return this.transfromAtrrLogic();
     }
     const object = String(this.object?.toVue(options)); // undefined 也让正常展示
     const property = String(this.property?.toVue(options));
 
     const bindAttr: BindAttribute = this.getAncestor('BindAttribute') as BindAttribute;
-    if (bindAttr && (bindAttr.sync || bindAttr.model)) return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
+    if (bindAttr && (bindAttr.sync || bindAttr.model))
+      return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
 
-    if (Identifier_RE.test(property)) return options?.finalCode === false ? `${object}.${property}` : `(${object} || {}).${property}`;
+    if (Identifier_RE.test(property))
+      return options?.finalCode === false ? `${object}.${property}` : `(${object} || {}).${property}`;
     return options?.finalCode === false ? `${object}['${property}']` : `(${object} || {})['${property}']`;
   }
 
   toUI(): string {
     //  如果是枚举取值
-    if (this.object?.concept === 'Identifier' && (this.object as Identifier)?.isEnum() && this.property?.concept === 'Identifier') {
+    if (
+      this.object?.concept === 'Identifier' &&
+      (this.object as Identifier)?.isEnum() &&
+      this.property?.concept === 'Identifier'
+    ) {
       return `${this.object?.name}.${this.property?.name}`;
     }
-    if (this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') && this.property?.name === 'length') {
+    if (
+      this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') &&
+      this.property?.name === 'length'
+    ) {
       return `Object.keys(${this.object?.toJS()}).length`;
     }
     const object: string = this.object?.toUI();
     const property = this.property?.toUI();
-    const paramsMap:Record<string, string> = {
-      'pageNumber': 'page',
-      'pageSize': 'size',
+    const paramsMap: Record<string, string> = {
+      pageNumber: 'page',
+      pageSize: 'size',
       'sorting.field': 'sort',
-      'sorting.order': 'order'
+      'sorting.order': 'order',
     };
     if (paramsMap[this.property.name]) {
-      this.property.name = paramsMap[this.property.name]
+      this.property.name = paramsMap[this.property.name];
     }
-    if (this.object instanceof Identifier && property === '$ce' && object === 'elements') return
-    if (this.object instanceof MemberExpression && this.object?.object?.name === 'elements' && this.object?.property?.name === '$ce') {
-      return  Identifier_RE.test(property) ? `当前组件.${property}` : `当前组件['${property}']`;
+    if (this.object instanceof Identifier && property === '$ce' && object === 'elements') return;
+    if (
+      this.object instanceof MemberExpression &&
+      this.object?.object?.name === 'elements' &&
+      this.object?.property?.name === '$ce'
+    ) {
+      return Identifier_RE.test(property) ? `当前组件.${property}` : `当前组件['${property}']`;
     }
 
     return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
@@ -215,29 +248,45 @@ export class MemberExpression extends LogicItem {
 
   toJS(): string {
     //  如果是枚举取值
-    if (this.object?.concept === 'Identifier' && (this.object as Identifier)?.isEnum() && this.property?.concept === 'Identifier') {
+    if (
+      this.object?.concept === 'Identifier' &&
+      (this.object as Identifier)?.isEnum() &&
+      this.property?.concept === 'Identifier'
+    ) {
       return `"${this.property?.name}"`;
     }
-    if (this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') && this.property?.name === 'length') {
+    if (
+      this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') &&
+      this.property?.name === 'length'
+    ) {
       return `Object.keys(${this.object?.toJS()}).length`;
     }
-    if (this.object instanceof Identifier && this.property instanceof Identifier && this.object?.namespace?.startsWith('elements.') && this.object?.namespace?.endsWith('.property')) {
-      let elementName = ''
+    if (
+      this.object instanceof Identifier &&
+      this.property instanceof Identifier &&
+      this.object?.namespace?.startsWith('elements.') &&
+      this.object?.namespace?.endsWith('.property')
+    ) {
+      let elementName = '';
       if (this.object.namespace.startsWith('elements.$ce')) {
-        elementName = this.getAncestor('ViewElement')?.name
+        elementName = this.getAncestor('ViewElement')?.name;
       } else {
-        elementName = this.object.name
+        elementName = this.object.name;
       }
-      let propertyName = ''
-      let subProperty = ''
+      let propertyName = '';
+      let subProperty = '';
       if (this.property instanceof Identifier) {
-        const namespace = this.property.namespace
-        const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace]
-        propertyName = namespaceList[0]
-        subProperty = namespaceList?.[1] ? `['${namespaceList?.[1]}']` : ''
+        const namespace = this.property.namespace;
+        const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace];
+        propertyName = namespaceList[0];
+        subProperty = namespaceList?.[1] ? `['${namespaceList?.[1]}']` : '';
       }
-      return `this['__${elementName}_${propertyName}']${subProperty}`
-    } else if (this.object instanceof MemberExpression && this.object?.object?.name === 'elements' && this.object?.property?.name === '$ce') {
+      return `this['__${elementName}_${propertyName}']${subProperty}`;
+    } else if (
+      this.object instanceof MemberExpression &&
+      this.object?.object?.name === 'elements' &&
+      this.object?.property?.name === '$ce'
+    ) {
       return this.transfromAtrrLogic();
     }
     const object: string = this.object?.toJS();
@@ -340,17 +389,17 @@ export class MemberExpression extends LogicItem {
     return value;
   }
   transfromAtrrLogic() {
-    let elementName = this.getAncestor('ViewElement')?.name
-    let propertyName = ''
-    let subProperty = ''
-    let name = this.property.name
+    let elementName = this.getAncestor('ViewElement')?.name;
+    let propertyName = '';
+    let subProperty = '';
+    let name = this.property.name;
     if (atrrParamsMap[this.property.name]) {
-      name = atrrParamsMap[this.property.name]
+      name = atrrParamsMap[this.property.name];
     }
-    const namesList = name.includes('.') ? name.split('.') : [name]
-    propertyName = namesList[0]
-    subProperty = namesList?.[1] ? `['${namesList?.[1]}']` : ''
-    return `this['__${elementName}_${propertyName}']${subProperty}`
+    const namesList = name.includes('.') ? name.split('.') : [name];
+    propertyName = namesList[0];
+    subProperty = namesList?.[1] ? `['${namesList?.[1]}']` : '';
+    return `this['__${elementName}_${propertyName}']${subProperty}`;
   }
 
   get completeName() {
@@ -408,42 +457,50 @@ export class MemberExpression extends LogicItem {
       const newCode = `${code.substring(0, lastIndex)}['${code.substring(lastIndex + 1, code.length)}']`;
       code = newCode;
     }
-    if (this.object instanceof Identifier && this.object?.namespace?.startsWith('elements.') && this.object?.namespace?.endsWith('.property')) {
-        let newCode = ''
-        if (this.object?.namespace?.startsWith('elements.$ce')) {
-            const elementName = this.getAncestor('ViewElement')?.name
-            newCode += `__elements_completionProperty.${elementName}`
-            if (this.property instanceof Identifier) {
-                const namespace = this.property.namespace
-                const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace]
-                namespaceList.forEach((item) => {
-                    newCode += `.${attrConvertCamelCase(item)}`
-                })
-            }
-        } else {
-            newCode += `__elements.${this.object?.name}`
-            if (this.property instanceof Identifier) {
-                const namespace = this.property.namespace
-                const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace]
-                namespaceList.forEach((item) => {
-                    newCode += `['${item}']`
-                })
-            }
+    if (
+      this.object instanceof Identifier &&
+      this.object?.namespace?.startsWith('elements.') &&
+      this.object?.namespace?.endsWith('.property')
+    ) {
+      let newCode = '';
+      if (this.object?.namespace?.startsWith('elements.$ce')) {
+        const elementName = this.getAncestor('ViewElement')?.name;
+        newCode += `__elements_completionProperty.${elementName}`;
+        if (this.property instanceof Identifier) {
+          const namespace = this.property.namespace;
+          const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace];
+          namespaceList.forEach((item) => {
+            newCode += `.${attrConvertCamelCase(item)}`;
+          });
         }
-        return newCode
+      } else {
+        newCode += `__elements.${this.object?.name}`;
+        if (this.property instanceof Identifier) {
+          const namespace = this.property.namespace;
+          const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace];
+          namespaceList.forEach((item) => {
+            newCode += `['${item}']`;
+          });
+        }
+      }
+      return newCode;
     }
-    if (this.object instanceof MemberExpression && this.object?.object?.name === 'elements' && this.object?.property?.name === '$ce') {
-      let newCode = ''
-      const elementName = this.getAncestor('ViewElement')?.name
-      newCode += `__elements_completionProperty['${elementName}']`
+    if (
+      this.object instanceof MemberExpression &&
+      this.object?.object?.name === 'elements' &&
+      this.object?.property?.name === '$ce'
+    ) {
+      let newCode = '';
+      const elementName = this.getAncestor('ViewElement')?.name;
+      newCode += `__elements_completionProperty['${elementName}']`;
       if (atrrParamsMap[this.property.name]) {
-          const name = atrrParamsMap[this.property.name]
-          const nameList = name.includes('.') ? name.split('.') : [name]
-          nameList.forEach((item) => {
-              newCode += `.${attrConvertCamelCase(item)}`
-          })
+        const name = atrrParamsMap[this.property.name];
+        const nameList = name.includes('.') ? name.split('.') : [name];
+        nameList.forEach((item) => {
+          newCode += `.${attrConvertCamelCase(item)}`;
+        });
       }
-      return newCode
+      return newCode;
     }
     return code;
   }
@@ -481,15 +538,14 @@ export class MemberExpression extends LogicItem {
     return tempNode;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.MemberExpression = MemberExpression;
 export default MemberExpression;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/MicroApp__.ts

@@ -1,82 +1,88 @@
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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';
 
 /**
  * 微应用
  */
+@className
 @concept('微应用')
+// @ts-ignore
 export class MicroApp extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'MicroApp';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'MicroApp' = 'MicroApp';
+  // @ts-ignore
+  readonly concept!: 'MicroApp';
 
   /**
    * 微前端框架
    */
   @property()
-  framework: 'qiankun' | 'icestark' = undefined;
+  // @ts-ignore
+  framework!: 'qiankun' | 'icestark';
 
   /**
    * 微应用名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * 页面路径前缀
    */
   @property()
-  routePrefix: string = undefined;
+  // @ts-ignore
+  routePrefix!: string;
 
   /**
    * 接口和静态资源前缀
    */
   @property()
-  proxyPrefix: string = undefined;
+  // @ts-ignore
+  proxyPrefix!: string;
 
   /**
    * 登录页面地址
    */
   @property()
-  loginUrl: string = undefined;
+  // @ts-ignore
+  loginUrl!: string;
 
   /**
    * 无权限页面地址
    */
   @property()
-  noAuthUrl: string = undefined;
+  // @ts-ignore
+  noAuthUrl!: string;
 
   /**
    * 404页面地址
    */
   @property()
-  notFoundUrl: string = undefined;
+  // @ts-ignore
+  notFoundUrl!: string;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<MicroApp>) {
-    // @ts-ignore
-    source = { ...MicroApp.getDefaultOptions(), ...source };
+    source = Object.assign({}, MicroApp.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'MicroApp';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): MicroApp {
     return super.from(source, parentNode, parentKey) as MicroApp;
   }
@@ -93,20 +99,19 @@ export class MicroApp extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.MicroApp = MicroApp;
 export default MicroApp;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================