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

package/src/concepts/FrontendLibrary__.ts

@@ -1,21 +1,20 @@
 import type Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import Module from './Module__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import type Logic from './Logic__';
-import type ViewComponent from './ViewComponent__';
-import type Module from './Module__';
-import type App from './App__';
+import Logic from './Logic__';
+import ViewComponentDeclaration from './ViewComponentDeclaration__';
 
 /**
  * 前端库
@@ -24,7 +23,11 @@ import type App from './App__';
 export class FrontendLibrary extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'FrontendLibrary';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -34,18 +37,21 @@ export class FrontendLibrary extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'FrontendLibrary';
-
   /**
    * 名称与type保持一致
    */
-  @property()
-  name!: 'pc' | 'h5';
+  @property({
+    objectRef: '',
+  })
+  name: 'pc' | 'h5' = 'pc';
 
   /**
    * PC/H5 端
    */
-  @property()
-  type!: 'pc' | 'h5';
+  @property({
+    objectRef: '',
+  })
+  type: 'pc' | 'h5';
 
   /**
    * 逻辑列表
@@ -61,24 +67,11 @@ export class FrontendLibrary extends BaseNode {
    * 页面组件列表
    */
   @property({
-    objectRef: 'ViewComponent',
+    objectRef: 'ViewComponentDeclaration',
     isArray: true,
     defaultValue: [],
   })
-  viewComponents: Array<ViewComponent> = [];
-
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
+  viewComponents: Array<ViewComponentDeclaration> = [];
 
   /**
    * @param source 需要合并的部分参数
@@ -93,21 +86,9 @@ export class FrontendLibrary extends BaseNode {
     return super.from(source, parentNode, parentKey) as FrontendLibrary;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeFrontendLibrary?.(this);
-    }
-    return params;
-  }
-
   getLogicExistingNames(excludedList: Array<Logic> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    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);
@@ -259,14 +240,14 @@ export class FrontendLibrary extends BaseNode {
     return node;
   }
 
-  getViewComponentExistingNames(excludedList: Array<ViewComponent> = []) {
+  getViewComponentDeclarationExistingNames(excludedList: Array<ViewComponentDeclaration> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.viewComponents as ViewComponent[]) || [])
+    return ((this.viewComponents as ViewComponentDeclaration[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+      .map((item) => item.name);
   }
-  getViewComponentUniqueName(name = 'viewComponent1') {
-    return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
+  getViewComponentDeclarationUniqueName(name = 'viewComponentDeclaration1') {
+    return utils.unique(name, this.getViewComponentDeclarationExistingNames(), undefined, false);
   }
 
   /**
@@ -274,83 +255,101 @@ export class FrontendLibrary extends BaseNode {
    * @internal
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  _insertViewComponentAt(name: string, index: number): ViewComponent;
+  _insertViewComponentDeclarationAt(name: string, index: number): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
    * @internal
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+  _insertViewComponentDeclarationAt(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+    index: number,
+  ): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
    * @internal
-   * @param viewComponent 已有的页面组件实例
-   */
-  _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
-
-  _insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
-    const viewComponentOptions: any = {};
+   * @param viewComponentDeclaration 已有的页面组件实例
+   */
+  _insertViewComponentDeclarationAt(
+    viewComponentDeclaration: ViewComponentDeclaration,
+    index: number,
+  ): ViewComponentDeclaration;
+
+  _insertViewComponentDeclarationAt(
+    options: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration,
+    index: number,
+  ) {
+    const viewComponentDeclarationOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'viewComponents' };
-    const ViewComponent = getConceptConstructor('ViewComponent');
-    let viewComponent: ViewComponent;
+    const ViewComponentDeclaration = getConceptConstructor('ViewComponentDeclaration');
+    let viewComponentDeclaration: ViewComponentDeclaration;
     if (!options) {
-      viewComponent = ViewComponent.from(
+      viewComponentDeclaration = ViewComponentDeclaration.from(
         {
-          ...viewComponentOptions,
-          name: this.getViewComponentUniqueName(),
+          ...viewComponentDeclarationOptions,
+          name: this.getViewComponentDeclarationUniqueName(),
         },
         this,
         'viewComponents',
       );
     } else if (typeof options === 'string') {
-      viewComponent = ViewComponent.from(
+      viewComponentDeclaration = ViewComponentDeclaration.from(
         {
-          ...viewComponentOptions,
+          ...viewComponentDeclarationOptions,
           name: options,
         },
         this,
         'viewComponents',
       );
-    } else if (asserts.isViewComponent(options)) {
+    } else if (asserts.isViewComponentDeclaration(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
-      viewComponent = options;
-      Object.assign(viewComponent, relationOptions);
+      viewComponentDeclaration = options;
+      Object.assign(viewComponentDeclaration, relationOptions);
     } else {
-      viewComponent = ViewComponent.from(
+      viewComponentDeclaration = ViewComponentDeclaration.from(
         {
-          ...viewComponentOptions,
+          ...viewComponentDeclarationOptions,
           ...options,
         },
         this,
         'viewComponents',
       );
     }
-    this.viewComponents.splice(index, 0, viewComponent);
-    return viewComponent;
+    this.viewComponents.splice(index, 0, viewComponentDeclaration);
+    return viewComponentDeclaration;
   }
 
   /**
    * 插入页面组件
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  insertViewComponentAt(name: string, index: number): ViewComponent;
+  insertViewComponentDeclarationAt(name: string, index: number): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+  insertViewComponentDeclarationAt(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+    index: number,
+  ): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
-   * @param viewComponent 已有的页面组件实例
-   */
-  insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
-
-  insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
-    const node = this._insertViewComponentAt(options as any, index);
+   * @param viewComponentDeclaration 已有的页面组件实例
+   */
+  insertViewComponentDeclarationAt(
+    viewComponentDeclaration: ViewComponentDeclaration,
+    index: number,
+  ): ViewComponentDeclaration;
+
+  insertViewComponentDeclarationAt(
+    options: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration,
+    index: number,
+  ) {
+    const node = this._insertViewComponentDeclarationAt(options as any, index);
     node.create({
       index,
       parentNode: this,
@@ -364,25 +363,27 @@ export class FrontendLibrary extends BaseNode {
    * @internal
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  _addViewComponent(name?: string): ViewComponent;
+  _addViewComponentDeclaration(name?: string): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
    * @internal
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  _addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+  _addViewComponentDeclaration(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+  ): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
    * @internal
-   * @param viewComponent 已有的页面组件实例
+   * @param viewComponentDeclaration 已有的页面组件实例
    */
-  _addViewComponent(viewComponent: ViewComponent): ViewComponent;
+  _addViewComponentDeclaration(viewComponentDeclaration: ViewComponentDeclaration): ViewComponentDeclaration;
 
-  _addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
+  _addViewComponentDeclaration(options?: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration) {
     const index = this.viewComponents.length;
-    return this._insertViewComponentAt(options as any, index);
+    return this._insertViewComponentDeclarationAt(options as any, index);
   }
 
   /**
@@ -390,22 +391,24 @@ export class FrontendLibrary extends BaseNode {
    * @internal
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  addViewComponent(name?: string): ViewComponent;
+  addViewComponentDeclaration(name?: string): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+  addViewComponentDeclaration(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+  ): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
-   * @param viewComponent 已有的页面组件实例
+   * @param viewComponentDeclaration 已有的页面组件实例
    */
-  addViewComponent(viewComponent: ViewComponent): ViewComponent;
+  addViewComponentDeclaration(viewComponentDeclaration: ViewComponentDeclaration): ViewComponentDeclaration;
 
-  addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
-    const node = this._addViewComponent(options as any);
+  addViewComponentDeclaration(options?: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration) {
+    const node = this._addViewComponentDeclaration(options as any);
     const index = this.viewComponents.indexOf(node);
     node.create({
       index,
@@ -440,97 +443,44 @@ export class FrontendLibrary extends BaseNode {
     return logic.delete();
   }
 
-  __removeLogic(logic: Logic) {
-    const parentKey = logic.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logic,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logic.__v_raw || logic;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除页面组件
    * @param name 页面组件名称
    */
-  removeViewComponent(name: string): void;
+  removeViewComponentDeclaration(name: string): void;
 
   /**
    * 删除页面组件
-   * @param viewComponent 已有的页面组件实例
+   * @param viewComponentDeclaration 已有的页面组件实例
    */
-  removeViewComponent(viewComponent: ViewComponent): void;
+  removeViewComponentDeclaration(viewComponentDeclaration: ViewComponentDeclaration): void;
 
-  removeViewComponent(options: string | ViewComponent) {
-    let viewComponent: ViewComponent;
+  removeViewComponentDeclaration(options: string | ViewComponentDeclaration) {
+    let viewComponentDeclaration: ViewComponentDeclaration;
     if (typeof options === 'string') {
-      viewComponent = (this.viewComponents as ViewComponent[]).find((item) => item.name === options);
-      if (!viewComponent) {
+      viewComponentDeclaration = (this.viewComponents as ViewComponentDeclaration[]).find(
+        (item) => item.name === options,
+      );
+      if (!viewComponentDeclaration) {
         throw new Error('找不到页面组件 ' + options);
       }
     } else {
-      viewComponent = options;
+      viewComponentDeclaration = options;
     }
-    return viewComponent.delete();
-  }
-
-  __removeViewComponent(viewComponent: ViewComponent) {
-    const parentKey = viewComponent.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: viewComponent,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = viewComponent.__v_raw || viewComponent;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
+    return viewComponentDeclaration.delete();
   }
 
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  /**
+   * 祖先 Module
+   */
+  get module() {
+    return this.getAncestor('Module') as Module;
+  }
+
   getNamespace() {
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();

package/src/concepts/FrontendType__.ts

@@ -8,16 +8,16 @@ import { AssetsInfo } from './App__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import type Frontend from './Frontend__';
-import type BusinessComponent from './BusinessComponent__';
-import type Module from './Module__';
+import Frontend from './Frontend__';
+import BusinessComponent from './BusinessComponent__';
+import Module from './Module__';
 
 /**
  * 端类型
@@ -26,7 +26,11 @@ import type Module from './Module__';
 export class FrontendType extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'FrontendType';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -36,18 +40,21 @@ export class FrontendType extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'FrontendType';
-
   /**
    * 名称与type保持一致
    */
-  @property()
-  name!: 'pc' | 'h5';
+  @property({
+    objectRef: '',
+  })
+  name: 'pc' | 'h5';
 
   /**
    * PC/H5 端
    */
-  @property()
-  kind!: 'pc' | 'h5';
+  @property({
+    objectRef: '',
+  })
+  kind: 'pc' | 'h5';
 
   /**
    * 前端列表
@@ -92,21 +99,9 @@ export class FrontendType extends BaseNode {
     return super.from(source, parentNode, parentKey) as FrontendType;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeFrontendType?.(this);
-    }
-    return params;
-  }
-
   getFrontendExistingNames(excludedList: Array<Frontend> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.frontends as Frontend[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    return ((this.frontends as Frontend[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getFrontendUniqueName(name = 'frontend1') {
     return utils.unique(name, this.getFrontendExistingNames(), undefined, true);
@@ -262,7 +257,7 @@ export class FrontendType extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.businessComponents as BusinessComponent[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+      .map((item) => item.name);
   }
   getBusinessComponentUniqueName(name = 'component1') {
     return utils.unique(name, this.getBusinessComponentExistingNames(), undefined, false);
@@ -418,7 +413,7 @@ export class FrontendType extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.componentDependencies as Module[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+      .map((item) => item.name);
   }
   getModuleUniqueName(name = 'module1') {
     return utils.unique(name, this.getModuleExistingNames(), undefined, false);
@@ -595,37 +590,6 @@ export class FrontendType extends BaseNode {
     return frontend.delete();
   }
 
-  __removeFrontend(frontend: Frontend) {
-    const parentKey = frontend.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: frontend,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = frontend.__v_raw || frontend;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除业务组件
    * @param name 业务组件名称
@@ -651,37 +615,6 @@ export class FrontendType extends BaseNode {
     return component.delete();
   }
 
-  __removeBusinessComponent(component: BusinessComponent) {
-    const parentKey = component.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: component,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = component.__v_raw || component;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除模块
    * @param name 模块名称
@@ -707,37 +640,6 @@ export class FrontendType extends BaseNode {
     return module.delete();
   }
 
-  __removeModule(module: Module) {
-    const parentKey = module.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: module,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = module.__v_raw || module;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -769,6 +671,7 @@ export class FrontendType extends BaseNode {
     let code = `export namespace ${self.name} {\n`;
     code += 'const name = ';
     code += `"${self.name}";\n`;
+    code += 'export namespace businessComponents { }\n';
     code += '}\n';
     return code;
   }