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

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 自动生成，请不手动修改！
@@ -19,8 +22,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 LogicItem from './LogicItem__';
 
@@ -28,13 +31,12 @@ import LogicItem from './LogicItem__';
  * 标识符
  */
 @concept('标识符')
-// @ts-ignore
 export class Identifier extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Identifier';
+  static readonly ConceptName: string = 'Identifier';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,14 +49,12 @@ export class Identifier extends LogicItem {
    * 命名空间
    */
   @property()
-  // @ts-ignore
   namespace!: string;
 
   /**
    * 标识符名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -81,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;
@@ -101,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;
@@ -122,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;
@@ -147,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;
@@ -170,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;
@@ -198,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
     );
@@ -208,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;
@@ -216,8 +229,8 @@ export class Identifier extends LogicItem {
       return `__obj.${this.name}`;
     }
     // 只有data-source可以是函数 ，也可能是属性
-    if (Assert.isBindAttribute(self.parentNode) && self.parentNode.name === 'data-source') {
-      const { view } = self;
+    if (asserts.isBindAttribute(self.parentNode) && self.parentNode.name === 'data-source') {
+      const view = self.view || self.getAncestor('BusinessComponent') as BusinessComponent;
       const viewLogics = view.logics;
       const findLogic = viewLogics.find((item) => item.name === self.name);
       if (findLogic) {
@@ -225,13 +238,13 @@ 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
     // nasl.util.Enum 的 右侧是转成字符串的
     // 如果是identifier 而且枚举
-    // if (this.parentNode?.parentNode?Assert.isCallFunction(.parentNode)) {
+    // if (this.parentNode?.parentNode?asserts.isCallFunction(.parentNode)) {
     //     const calleeNamespace = this.parentNode.parentNode.parentNode.calleeNamespace;
     //     const calleeName = this.parentNode.parentNode.parentNode.calleeName;
     //     if (calleeNamespace + '.' + calleeName === 'nasl.util.Enum') {

package/src/concepts/IfStatement__.ts

@@ -18,8 +18,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 LogicItem from './LogicItem__';
 
@@ -27,13 +27,12 @@ import LogicItem from './LogicItem__';
  * 条件分支
  */
 @concept('条件分支')
-// @ts-ignore
 export class IfStatement extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'IfStatement';
+  static readonly ConceptName: string = 'IfStatement';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -48,7 +47,6 @@ export class IfStatement extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   test!: LogicItem;
 
   /**
@@ -142,7 +140,7 @@ export class IfStatement extends LogicItem {
     const relationOptions = { parentNode: this, parentKey: 'consequent' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -243,7 +241,7 @@ export class IfStatement extends LogicItem {
     const relationOptions = { parentNode: this, parentKey: 'alternate' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);

package/src/concepts/ImportedInterface__.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 AbstractInterface from './AbstractInterface__';
 
@@ -15,19 +15,17 @@ import AbstractInterface from './AbstractInterface__';
  * 由JSON生成接口
  */
 @concept('由JSON生成接口')
-// @ts-ignore
 export abstract class ImportedInterface extends AbstractInterface {
   /** 类名 */
-  static readonly ConceptName = 'ImportedInterface';
+  static readonly ConceptName: string = 'ImportedInterface';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['AbstractInterface', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['AbstractInterface', 'BaseNode'];
 
   /**
    * exampleMap
    */
   @property()
-  // @ts-ignore
   exampleMap!: Map<'responseBody' | 'requestBody', string>;
 
   /**

package/src/concepts/Integration__.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';
 import type MicroApp from './MicroApp__';
@@ -19,13 +19,12 @@ import type Module from './Module__';
  * 集成
  */
 @concept('集成')
-// @ts-ignore
 export class Integration extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Integration';
+  static readonly ConceptName: string = 'Integration';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -40,7 +39,6 @@ export class Integration extends BaseNode {
   @property({
     objectRef: 'MicroApp',
   })
-  // @ts-ignore
   microApp!: MicroApp;
 
   /**
@@ -163,7 +161,7 @@ export class Integration extends BaseNode {
         this,
         'connectors',
       );
-    } else if (Assert.isConnector(options)) {
+    } else if (asserts.isConnector(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connector = options;
       Object.assign(connector, relationOptions);

package/src/concepts/InterfaceParam__.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 TypeAnnotation from './TypeAnnotation__';
@@ -40,13 +40,12 @@ import type Process from './Process__';
  * 接口参数
  */
 @concept('接口参数')
-// @ts-ignore
 export class InterfaceParam extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'InterfaceParam';
+  static readonly ConceptName: string = 'InterfaceParam';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -59,14 +58,12 @@ export class InterfaceParam extends BaseNode {
    * 接口参数名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 接口参数描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -75,21 +72,18 @@ export class InterfaceParam extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 参数位置
    */
   @property()
-  // @ts-ignore
   in!: 'query' | 'path' | 'body' | 'header' | 'cookie';
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
@@ -98,7 +92,6 @@ export class InterfaceParam extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**

package/src/concepts/Interface__.ts

@@ -22,8 +22,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 ImportedInterface from './ImportedInterface__';
 import type InterfaceParam from './InterfaceParam__';
@@ -41,13 +41,12 @@ import type Process from './Process__';
  * 接口
  */
 @concept('接口')
-// @ts-ignore
 export class Interface extends ImportedInterface {
   /** 类名 */
-  static readonly ConceptName = 'Interface';
+  static readonly ConceptName: string = 'Interface';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['ImportedInterface', 'AbstractInterface', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['ImportedInterface', 'AbstractInterface', 'BaseNode'];
 
   /**
    * 产品概念
@@ -60,35 +59,30 @@ export class Interface extends ImportedInterface {
    * 接口名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 导出的来源
    */
   @property()
-  // @ts-ignore
   originLogicName!: string;
 
   /**
    * 接口路径
    */
   @property()
-  // @ts-ignore
   path!: string;
 
   /**
    * 接口方法
    */
   @property()
-  // @ts-ignore
   method!: 'GET' | 'POST' | 'PUT' | 'DELETE';
 
   /**
    * 接口描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -117,7 +111,6 @@ export class Interface extends ImportedInterface {
   @property({
     objectRef: 'BindAttribute',
   })
-  // @ts-ignore
   validation!: BindAttribute;
 
   /**
@@ -264,7 +257,7 @@ export class Interface extends ImportedInterface {
         this,
         'params',
       );
-    } else if (Assert.isInterfaceParam(options)) {
+    } else if (asserts.isInterfaceParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       interfaceParam = options;
       Object.assign(interfaceParam, relationOptions);
@@ -414,7 +407,7 @@ export class Interface extends ImportedInterface {
         this,
         'returns',
       );
-    } else if (Assert.isReturn(options)) {
+    } else if (asserts.isReturn(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       ret = options;
       Object.assign(ret, relationOptions);
@@ -1127,7 +1120,7 @@ export class Interface extends ImportedInterface {
   }
 
   deleteRefStructures(includeNameList?: string[]) {
-    if (Assert.isConnector(this.upperNode)) {
+    if (asserts.isConnector(this.upperNode)) {
       const module = this.upperNode;
       const oldStructuresSet = this.getRefStructures(module.structures, includeNameList);
       oldStructuresSet.forEach((s: Structure) => s.delete());

package/src/concepts/JSBlock__.ts

@@ -15,8 +15,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 LogicItem from './LogicItem__';
 
@@ -24,13 +24,12 @@ import LogicItem from './LogicItem__';
  * JS 代码块
  */
 @concept('JS 代码块')
-// @ts-ignore
 export class JSBlock extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'JSBlock';
+  static readonly ConceptName: string = 'JSBlock';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -49,7 +48,6 @@ export class JSBlock extends LogicItem {
    * 代码内容
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**

package/src/concepts/JavaLogic__.ts

@@ -15,8 +15,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 LogicItem from './LogicItem__';
 
@@ -24,13 +24,12 @@ import LogicItem from './LogicItem__';
  * Java 扩展逻辑
  */
 @concept('Java 扩展逻辑')
-// @ts-ignore
 export class JavaLogic extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'JavaLogic';
+  static readonly ConceptName: string = 'JavaLogic';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -43,21 +42,18 @@ export class JavaLogic extends LogicItem {
    * 包名
    */
   @property()
-  // @ts-ignore
   packageName!: string;
 
   /**
    * className
    */
   @property()
-  // @ts-ignore
   className!: string;
 
   /**
    * 代码内容
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**

package/src/concepts/LogicItem__.ts

@@ -18,8 +18,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 OverriddenLogic from './OverriddenLogic__';
@@ -38,13 +38,12 @@ import type Connector from './Connector__';
  * 逻辑项
  */
 @concept('逻辑项')
-// @ts-ignore
 export class LogicItem extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'LogicItem';
+  static readonly ConceptName: string = 'LogicItem';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -67,6 +66,7 @@ export class LogicItem extends BaseNode {
     | 'Comment'
     | 'CallLogic'
     | 'CallConnector'
+    | 'CallEvent'
     | 'CallFunction'
     | 'CallInterface'
     | 'CallAuthInterface'
@@ -94,7 +94,6 @@ export class LogicItem extends BaseNode {
     | 'NewComposite'
     | 'NewList'
     | 'NewMap'
-    | 'Paginate'
     | 'CallQueryComponent'
     | 'QueryFromExpression'
     | 'QueryJoinExpression'
@@ -114,14 +113,12 @@ export class LogicItem extends BaseNode {
    * 逻辑项标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 逻辑项描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -134,14 +131,12 @@ export class LogicItem extends BaseNode {
    * offsetX
    */
   @property()
-  // @ts-ignore
   offsetX!: number;
 
   /**
    * offsetY
    */
   @property()
-  // @ts-ignore
   offsetY!: number;
 
   /**