@lcap/nasl 3.5.0-beta.1 → 3.5.0-beta.3

package/src/concepts/FrontendVariable__.ts

@@ -10,8 +10,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import Variable from './Variable__';
 
@@ -19,13 +19,19 @@ import Variable from './Variable__';
  * 前端全局变量
  */
 @concept('前端全局变量')
-// @ts-ignore
 export class FrontendVariable extends Variable {
   /** 类名 */
-  static readonly ConceptName = 'FrontendVariable';
+  static readonly ConceptName: string = 'FrontendVariable';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['Variable', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Variable', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'FrontendVariable';
 
   /**
    * 是否开启本地缓存
@@ -63,12 +69,12 @@ export class FrontendVariable extends Variable {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
-    /**
+  /**
    * 默认值toJS的结果
    */
-    @property()
-    defaultCode: defaultCode = {};
-    
+  @property()
+  defaultCode: defaultCode = {};
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Frontend__.ts

@@ -9,7 +9,6 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import { AssetsInfo } from './App__';
 import type Namespace from './Namespace__';
 import { languageList } from '../utils/i18nInfo';
 
@@ -21,15 +20,14 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+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 BindEvent from './BindEvent__';
 import type View from './View__';
 import type FrontendVariable from './FrontendVariable__';
 import Theme from './Theme__';
-import type Module from './Module__';
 import type I18nInfo from './I18nInfo__';
 import type App from './App__';
 import type Variable from './Variable__';
@@ -38,13 +36,12 @@ import type Variable from './Variable__';
  * 前端
  */
 @concept('前端')
-// @ts-ignore
 export class Frontend extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Frontend';
+  static readonly ConceptName: string = 'Frontend';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -57,42 +54,36 @@ export class Frontend extends BaseNode {
    * 前端标识
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * pc端
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * PC/H5 端
    */
   @property()
-  // @ts-ignore
   type!: 'pc' | 'h5';
 
   /**
    * 基础路径
    */
   @property()
-  // @ts-ignore
   path!: string;
 
   /**
    * 制品应用标题
    */
   @property()
-  // @ts-ignore
   documentTitle!: string;
 
   /**
    * 制品应用图标
    */
   @property()
-  // @ts-ignore
   documentIcon!: string;
 
   /**
@@ -133,16 +124,6 @@ export class Frontend extends BaseNode {
   })
   theme: Theme = new Theme();
 
-  /**
-   * 扩展组件列表（兼容老版）
-   */
-  @property({
-    objectRef: 'Module',
-    isArray: true,
-    defaultValue: [],
-  })
-  componentDependencies: Array<Module> = [];
-
   /**
    * 全局缩放开关
    */
@@ -161,7 +142,6 @@ export class Frontend extends BaseNode {
   @property({
     objectRef: 'I18nInfo',
   })
-  // @ts-ignore
   i18nInfo!: I18nInfo;
 
   /**
@@ -332,7 +312,7 @@ export class Frontend extends BaseNode {
         this,
         'bindEvents',
       );
-    } else if (Assert.isBindEvent(options)) {
+    } else if (asserts.isBindEvent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       bindEvent = options;
       Object.assign(bindEvent, relationOptions);
@@ -486,7 +466,7 @@ export class Frontend extends BaseNode {
         this,
         'views',
       );
-    } else if (Assert.isView(options)) {
+    } else if (asserts.isView(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       view = options;
       Object.assign(view, relationOptions);
@@ -642,7 +622,7 @@ export class Frontend extends BaseNode {
         this,
         'variables',
       );
-    } else if (Assert.isFrontendVariable(options)) {
+    } else if (asserts.isFrontendVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       frontendVariable = options;
       Object.assign(frontendVariable, relationOptions);
@@ -744,162 +724,6 @@ export class Frontend extends BaseNode {
     return node;
   }
 
-  getModuleExistingNames(excludedList: Array<Module> = []) {
-    const excludedSet = new Set(excludedList);
-    return ((this.componentDependencies as Module[]) || [])
-      .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
-  }
-  getModuleUniqueName(name = 'module1') {
-    return utils.unique(name, this.getModuleExistingNames(), undefined, false);
-  }
-
-  /**
-   * 插入模块
-   * @internal
-   * @param name 模块名称，如果不填会自动生成一个唯一名称
-   */
-  _insertModuleAt(name: string, index: number): Module;
-
-  /**
-   * 插入模块
-   * @internal
-   * @param moduleOptions 模块参数
-   */
-  _insertModuleAt(moduleOptions: Partial<Module>, index: number): Module;
-
-  /**
-   * 插入模块
-   * @internal
-   * @param module 已有的模块实例
-   */
-  _insertModuleAt(module: Module, index: number): Module;
-
-  _insertModuleAt(options: string | Partial<Module> | Module, index: number) {
-    const moduleOptions: any = {};
-    const relationOptions = { parentNode: this, parentKey: 'componentDependencies' };
-    const Module = getConceptConstructor('Module');
-    let module: Module;
-    if (!options) {
-      module = Module.from(
-        {
-          ...moduleOptions,
-          name: this.getModuleUniqueName(),
-        },
-        this,
-        'componentDependencies',
-      );
-    } else if (typeof options === 'string') {
-      module = Module.from(
-        {
-          ...moduleOptions,
-          name: options,
-        },
-        this,
-        'componentDependencies',
-      );
-    } else if (Assert.isModule(options)) {
-      options.ensureDelete(); // 同一实例不支持多处存在
-      module = options;
-      Object.assign(module, relationOptions);
-    } else {
-      module = Module.from(
-        {
-          ...moduleOptions,
-          ...options,
-        },
-        this,
-        'componentDependencies',
-      );
-    }
-    this.componentDependencies.splice(index, 0, module);
-    return module;
-  }
-
-  /**
-   * 插入模块
-   * @param name 模块名称，如果不填会自动生成一个唯一名称
-   */
-  insertModuleAt(name: string, index: number): Module;
-
-  /**
-   * 插入模块
-   * @param moduleOptions 模块参数
-   */
-  insertModuleAt(moduleOptions: Partial<Module>, index: number): Module;
-
-  /**
-   * 插入模块
-   * @param module 已有的模块实例
-   */
-  insertModuleAt(module: Module, index: number): Module;
-
-  insertModuleAt(options: string | Partial<Module> | Module, index: number) {
-    const node = this._insertModuleAt(options as any, index);
-    node.create({
-      index,
-      parentNode: this,
-      parentKey: 'componentDependencies',
-    });
-    return node;
-  }
-
-  /**
-   * 添加模块
-   * @internal
-   * @param name 模块名称，如果不填会自动生成一个唯一名称
-   */
-  _addModule(name?: string): Module;
-
-  /**
-   * 添加模块
-   * @internal
-   * @param moduleOptions 模块参数
-   */
-  _addModule(moduleOptions: Partial<Module>): Module;
-
-  /**
-   * 添加模块
-   * @internal
-   * @param module 已有的模块实例
-   */
-  _addModule(module: Module): Module;
-
-  _addModule(options?: string | Partial<Module> | Module) {
-    const index = this.componentDependencies.length;
-    return this._insertModuleAt(options as any, index);
-  }
-
-  /**
-   * 添加模块
-   * @internal
-   * @param name 模块名称，如果不填会自动生成一个唯一名称
-   */
-  addModule(name?: string): Module;
-
-  /**
-   * 添加模块
-   * @param moduleOptions 模块参数
-   */
-  addModule(moduleOptions: Partial<Module>): Module;
-
-  /**
-   * 添加模块
-   * @param module 已有的模块实例
-   */
-  addModule(module: Module): Module;
-
-  addModule(options?: string | Partial<Module> | Module) {
-    const node = this._addModule(options as any);
-    const index = this.componentDependencies.indexOf(node);
-    node.create({
-      index,
-      parentNode: this,
-      parentKey: 'componentDependencies',
-    });
-    return node;
-  }
-
   /**
    * 删除元素绑定事件
    * @param name 元素绑定事件名称
@@ -1124,62 +948,6 @@ export class Frontend extends BaseNode {
     return params;
   }
 
-  /**
-   * 删除模块
-   * @param name 模块名称
-   */
-  removeModule(name: string): void;
-
-  /**
-   * 删除模块
-   * @param module 已有的模块实例
-   */
-  removeModule(module: Module): void;
-
-  removeModule(options: string | Module) {
-    let module: Module;
-    if (typeof options === 'string') {
-      module = (this.componentDependencies as Module[]).find((item) => item.name === options);
-      if (!module) {
-        throw new Error('找不到模块 ' + options);
-      }
-    } else {
-      module = options;
-    }
-    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;
-  }
-
   /**
    * 删除国际化信息
    * @param name 国际化信息名称
@@ -1241,10 +1009,6 @@ export class Frontend extends BaseNode {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
-  findComponentDependencyByName(name: string) {
-    return this.componentDependencies.find((componentDependency) => componentDependency.name === name);
-  }
-
   /**
    * @param path 路径
    * path 为要查找路径：如 /dashboard/student/list、/dashboard/student/list
@@ -1308,7 +1072,9 @@ export class Frontend extends BaseNode {
    * @param name 一般不用传，用于 rename
    */
   getEmbeddedFilePath(name = this.name) {
-    return `/embedded/${this.rootNode?.name || this.parentNode.name}/frontends/${name}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${
+      this.getAncestor('FrontendType')?.name
+    }/frontends/${name}.ts`;
   }
 
   @withSourceMapGenerator
@@ -1366,28 +1132,6 @@ export class Frontend extends BaseNode {
     return basePath;
   }
 
-  genCustomAssetsInfo(prefix: string) {
-    const custom: AssetsInfo = {
-      js: [],
-      css: [],
-      names: [],
-    };
-    const existingSet = new Set();
-    this.componentDependencies.forEach((dep) => {
-      const { name, version } = dep;
-      const jsName = `${prefix}/packages/${name}@${version}/dist-theme/index.js`;
-      if (!existingSet.has(jsName)) {
-        existingSet.add(jsName);
-        custom.js.push(jsName);
-        if (utils.shouldLoadCss(name, version)) {
-          custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
-        }
-        custom.names.push(name);
-      }
-    });
-    return custom;
-  }
-
   getExtensionsCallbackLogics() {
     let resultLogics: string[] = [];
     this.views.forEach((item: View) => {

package/src/concepts/Function__.ts

@@ -21,8 +21,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+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 TypeParam from './TypeParam__';
@@ -37,13 +37,12 @@ import type App from './App__';
  * 函数
  */
 @concept('函数')
-// @ts-ignore
 export class Function extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Function';
+  static readonly ConceptName: string = 'Function';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -56,14 +55,12 @@ export class Function extends BaseNode {
    * 函数名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 函数描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -112,7 +109,6 @@ export class Function extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   returnExpression!: LogicItem;
 
   /**
@@ -244,7 +240,7 @@ export class Function extends BaseNode {
         this,
         'typeParams',
       );
-    } else if (Assert.isTypeParam(options)) {
+    } else if (asserts.isTypeParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeParam = options;
       Object.assign(typeParam, relationOptions);
@@ -394,7 +390,7 @@ export class Function extends BaseNode {
         this,
         'params',
       );
-    } else if (Assert.isParam(options)) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -544,7 +540,7 @@ export class Function extends BaseNode {
         this,
         'returns',
       );
-    } else if (Assert.isReturn(options)) {
+    } else if (asserts.isReturn(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       ret = options;
       Object.assign(ret, relationOptions);
@@ -694,7 +690,7 @@ export class Function extends BaseNode {
         this,
         'variables',
       );
-    } else if (Assert.isVariable(options)) {
+    } else if (asserts.isVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       variable = options;
       Object.assign(variable, relationOptions);

package/src/concepts/I18nInfo__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 
@@ -15,13 +15,12 @@ import BaseNode from '../common/BaseNode';
  * 国际化信息
  */
 @concept('国际化信息')
-// @ts-ignore
 export class I18nInfo extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'I18nInfo';
+  static readonly ConceptName: string = 'I18nInfo';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -34,21 +33,18 @@ export class I18nInfo extends BaseNode {
    * 是否开启
    */
   @property()
-  // @ts-ignore
   enabled!: boolean;
 
   /**
    * locale
    */
   @property()
-  // @ts-ignore
   locale!: string;
 
   /**
    * 国际化配置列表
    */
   @property()
-  // @ts-ignore
   messages!: Map<String, Map<String, String>>;
 
   /**