@lcap/nasl 3.6.0-alpha.1 → 3.6.0-alpha.2

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';
 
@@ -29,7 +28,6 @@ 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__';
@@ -126,16 +124,6 @@ export class Frontend extends BaseNode {
   })
   theme: Theme = new Theme();
 
-  /**
-   * 扩展组件列表（兼容老版）
-   */
-  @property({
-    objectRef: 'Module',
-    isArray: true,
-    defaultValue: [],
-  })
-  componentDependencies: Array<Module> = [];
-
   /**
    * 全局缩放开关
    */
@@ -736,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 (asserts.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 元素绑定事件名称
@@ -1116,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 国际化信息名称
@@ -1233,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
@@ -1300,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
@@ -1358,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/Identifier__.ts

@@ -10,6 +10,9 @@ import {
 import { BindAttribute, CallLogic, TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import { findConceptKeyWordByNamespace } from '../utils';
+import type View from './View__';
+import BusinessComponent from './BusinessComponent__';
+import FrontendType from './FrontendType__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -78,15 +81,20 @@ export class Identifier extends LogicItem {
   globalDataMap: {
     [name: string]: boolean;
   } = {
-    $route: true,
-    $global: true,
-    $refs: true,
-  };
+      $route: true,
+      $global: true,
+      $refs: true,
+    };
 
   isEnum() {
     return findConceptKeyWordByNamespace(this.namespace) === 'enums';
   }
 
+  get isFrontendVariables() {
+    const frontendType = this.getAncestor('FrontendType') as FrontendType;
+    return this.namespace?.startsWith(`app.frontendTypes.${frontendType?.kind}.frontends`) && this.namespace?.endsWith('variables');
+  }
+
   toVue(options?: ElementToVueOptions): string {
     let { name } = this;
     const { namespace } = this;
@@ -98,7 +106,7 @@ export class Identifier extends LogicItem {
         this.namespace.endsWith('nasl.process')
       ) {
         name = `$global.${this.name}`;
-      } else if (this.namespace.startsWith('app.frontends') && this.namespace.endsWith('variables')) {
+      } else if (this.isFrontendVariables) {
         name = `$global.frontendVariables.${this.name}`;
       } else if (this.isEnum()) {
         let enumName = this.name;
@@ -119,7 +127,7 @@ export class Identifier extends LogicItem {
     if (namespace) {
       if (namespace.startsWith('nasl.')) {
         name = `${namespace}.${this.name}`;
-      } else if (namespace.startsWith('app.frontends') && namespace.endsWith('variables')) {
+      } else if (this.isFrontendVariables) {
         name = `nasl.frontendVariables.${this.name}`;
       } else if (this.isEnum()) {
         let enumName = this.name;
@@ -144,7 +152,7 @@ export class Identifier extends LogicItem {
         this.namespace.endsWith('nasl.process')
       ) {
         name = `$global.${this.name}`;
-      } else if (namespace.startsWith('app.frontends') && namespace.endsWith('variables')) {
+      } else if (this.isFrontendVariables) {
         name = `$global.frontendVariables.${this.name}`;
       } else if (this.isEnum()) {
         let enumName = this.name;
@@ -167,19 +175,23 @@ export class Identifier extends LogicItem {
     return this.isViewOrGlobalDataVariable() ? `this.${name}` : name;
   }
 
+  get likeComponent(): View | BusinessComponent {
+    return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
+  }
+
   // 页面/全局 级别的变量
   isViewOrGlobalDataVariable() {
     const dataMap: {
       [name: string]: boolean;
     } = {};
-    this.view?.params?.forEach((param) => {
+    this.likeComponent?.params?.forEach((param) => {
       dataMap[param.name] = true;
     });
-    this.view?.variables?.forEach((variable) => {
+    this.likeComponent?.variables?.forEach((variable) => {
       dataMap[variable.name] = true;
     });
     // 目前前端逻辑也会被当成可选变量（以datasource为典型）
-    this.view?.logics?.forEach((logics) => {
+    this.likeComponent?.logics?.forEach((logics) => {
       dataMap[logics.name] = true;
     });
     const { parentNode, namespace, jsName: name } = this;
@@ -195,7 +207,7 @@ export class Identifier extends LogicItem {
         namespace?.endsWith('nasl.auth') ||
         namespace?.endsWith('nasl.configuration') ||
         namespace?.endsWith('nasl.process') ||
-        (namespace?.startsWith('app.frontends') && namespace?.endsWith('variables')) ||
+        (this.isFrontendVariables) ||
         this.isEnum()) &&
       !isMemberExpressionProperty
     );
@@ -205,6 +217,10 @@ export class Identifier extends LogicItem {
     return this.name || '-';
   }
 
+  get businessComponent() {
+    return this.getAncestor('BusinessComponent') as BusinessComponent;
+  }
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState(), options?: any): TranslatorGenerator {
     const self = this;
@@ -214,7 +230,7 @@ export class Identifier extends LogicItem {
     }
     // 只有data-source可以是函数 ，也可能是属性
     if (asserts.isBindAttribute(self.parentNode) && self.parentNode.name === 'data-source') {
-      const { view } = self;
+      const view = self.view || self.getAncestor('BusinessComponent') as BusinessComponent;
       const viewLogics = view.logics;
       const findLogic = viewLogics.find((item) => item.name === self.name);
       if (findLogic) {
@@ -222,7 +238,7 @@ export class Identifier extends LogicItem {
       }
     }
     // 全局变量在不是页面的地方放置，就会报错
-    if (self.namespace?.startsWith('app.frontends') && self.namespace?.endsWith('variables') && !self.frontend) {
+    if (self.isFrontendVariables && !self.frontend) {
       return '__FRONTENDVARIABLES__';
     }
     // 如果是nasl.util.Enum 的子集里的 Identifier > MemberExpression > Argument > callfunction

package/src/concepts/LogicItem__.ts

@@ -66,6 +66,7 @@ export class LogicItem extends BaseNode {
     | 'Comment'
     | 'CallLogic'
     | 'CallConnector'
+    | 'CallEvent'
     | 'CallFunction'
     | 'CallInterface'
     | 'CallAuthInterface'

package/src/concepts/Logic__.ts

@@ -33,6 +33,7 @@ import type CallInterface from './CallInterface__';
 import type CallLogic from './CallLogic__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
 import type Interface from './Interface__';
+import type BusinessComponent from './BusinessComponent__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -76,7 +77,7 @@ export class Logic extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface';
+  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' | 'BusinessLogic';
 
   /**
    * 逻辑名称
@@ -1545,26 +1546,32 @@ export class Logic extends BaseNode {
     if (Array.isArray(this.variables)) {
       varList.push(...this.variables);
     }
-    if (this.view) {
-      // 页面下，变量名不可以跟逻辑名相同，会有js 翻译问题
+    if (this.likeComponent) {
+      // 页面/业务组件下，变量名不可以跟逻辑名相同，会有js 翻译问题
       varList.push(this);
 
-      if (Array.isArray(this.view.params)) {
-        varList.push(...this.view.params);
+      if (Array.isArray(this.likeComponent.params)) {
+        varList.push(...this.likeComponent.params);
       }
-      if (Array.isArray(this.view.variables)) {
-        varList.push(...this.view.variables);
+      if (Array.isArray(this.likeComponent.variables)) {
+        varList.push(...this.likeComponent.variables);
       }
     }
-
-    this.traverseChildren((el) => {
-      if (el?.concept === 'ForEachStatement') {
-        if ((el as ForEachStatement)?.item) {
-          varList.push((el as ForEachStatement)?.item);
-        }
-        if ((el as ForEachStatement)?.index) {
-          varList.push((el as ForEachStatement)?.index);
-        }
+    this.traverseChildren((node) => {
+      switch (node?.concept) {
+        case 'ForEachStatement':
+          if (node.item) {
+            varList.push(node?.item);
+          }
+          if (node.index) {
+            varList.push(node?.index);
+          }
+          break;
+        case 'AnonymousFunction':
+          node.params?.forEach((param: Param) => {
+            varList.push(param);
+          });
+          break;
       }
     });
     return varList.filter((item) => !excludedSet.has(item)).map((item) => item?.name);
@@ -1805,11 +1812,11 @@ export class Logic extends BaseNode {
     const IDENTIFIERMAP = new Set<Variable | Return>();
 
     if (!prefix) {
-      code += `export function ${self.name}`;
+      code += `export function ${self.tsName}`;
     } else if (prefix === 'noExport') {
-      code += `function ${self.name}`;
+      code += `function ${self.tsName}`;
     } else if (prefix === 'inObject') {
-      code += `${self.name}`;
+      code += `${self.tsName}`;
     }
     if (self.typeParams?.length) {
       code += '<';
@@ -2369,10 +2376,12 @@ ${indent(state.tabSize)} */\n`;
     }
     if (asserts.isFrontendLibrary(this.parentNode)) {
       _path += `/frontends/${this.parentNode.type}`;
-    } else if (this.parentNode.concept === 'BindEvent' && this.parentNode?.parentNode.concept === 'Frontend') {
-      _path += `/frontends/${this.parentNode.parentNode.name}/bindEvents/${name}.ts`;
+    } else if (this.parentNode.concept === 'BindEvent' && this.getAncestor('Frontend')) {
+      _path += `/frontendTypes/${this.getAncestor('FrontendType')?.name}/frontends/${
+        this.getAncestor('Frontend')?.name
+      }/bindEvents/${name}.ts`;
     }
-    return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}${_path}/logics/${name}.ts`;
   }
 
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
@@ -2490,7 +2499,7 @@ ${indent(state.tabSize)} */\n`;
   }
 
   get pathName(): string {
-    if (this.view) {
+    if (this.likeComponent) {
       return this.getEventLogicName('chinese');
     }
 
@@ -2580,6 +2589,10 @@ ${indent(state.tabSize)} */\n`;
     return this.getAncestor('Integration');
   }
 
+  get likeComponent(): View | BusinessComponent {
+    return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/MemberExpression__.ts

@@ -276,7 +276,7 @@ export class MemberExpression extends LogicItem {
       (this.object as Identifier)?.isEnum() &&
       this.property?.concept === 'Identifier'
     ) {
-      return this.isDefaultValueExpression() ? this.property?.name : `"${this.property?.name}"`;
+      return this.isDefaultValueExpression(!!state?.getVuePrototype) ? this.property?.name : `"${this.property?.name}"`;
     }
     if (
       this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') &&
@@ -379,8 +379,8 @@ export class MemberExpression extends LogicItem {
     return (this.object as Identifier)?.isEnum?.();
   }
 
-  isDefaultValueExpression() {
-    return this.parentNode instanceof DefaultValue;
+  isDefaultValueExpression(getVuePrototype: boolean) {
+    return this.parentNode instanceof DefaultValue && getVuePrototype;
   }
 
   // 方便快速取值,遍历获取value

package/src/concepts/NewComposite__.ts

@@ -1179,13 +1179,11 @@ export class NewComposite extends LogicItem {
     } else if (typeAnnotation.typeKind !== 'anonymousStructure') {
       // 实体、数据结构默认值使用new时需要改成vue.prototype才能获取到方法
       if (state?.getVuePrototype) {
-        code += `const obj = Vue.prototype.$genInitFromSchema('${
-          typeAnnotation.sortedTypeKey
-        }', Vue.prototype.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
+        code += `const obj = Vue.prototype.$genInitFromSchema('${typeAnnotation.sortedTypeKey
+          }', Vue.prototype.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
       } else {
-        code += `const obj = this.$genInitFromSchema('${
-          typeAnnotation.sortedTypeKey
-        }', this.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
+        code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey
+          }', this.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
       }
       const rightMap = new Map();
       this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {

package/src/concepts/ParamWithGroup__.ts

@@ -0,0 +1,101 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } 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 Param from './Param__';
+
+/**
+ * 参数分组
+ */
+@concept('参数分组')
+export class ParamWithGroup extends Param {
+  /** 类名 */
+  static readonly ConceptName: string = 'ParamWithGroup';
+
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['Param', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'ParamWithGroup';
+
+  /**
+   * 参数分组标题
+   */
+  @property()
+  title!: string;
+
+  /**
+   * 类别
+   */
+  @property()
+  group!: string;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<any>) {
+    source = Object.assign({}, ParamWithGroup.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): any {
+    return super.from(source, parentNode, parentKey) as any;
+  }
+
+  /**
+   * 设置参数分组标题
+   */
+  setTitle(title: string) {
+    const object = {
+      title,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  /**
+   * 设置类别
+   */
+  setGroup(group: string) {
+    const object = {
+      group,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+  static getDefaultOptions() {
+    return {
+      group: '主要属性',
+    };
+  }
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default ParamWithGroup;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================