@lcap/nasl 3.7.0-beta.4 → 3.7.0-beta.6

package/src/concepts/ConnectorTriggerLauncher__.ts

@@ -0,0 +1,117 @@
+import App from './App__';
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+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 TriggerLauncher from './TriggerLauncher__';
+
+/**
+ * 连接器触发器启动器
+ */
+@concept('连接器触发器启动器')
+export class ConnectorTriggerLauncher extends TriggerLauncher {
+  /** 类名 */
+  static readonly ConceptName: string = 'ConnectorTriggerLauncher';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['TriggerLauncher', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'ConnectorTriggerLauncher' | 'MsgTriggerLauncher';
+  /**
+   * calleeConnectionName
+   */
+  @property({
+    objectRef: '',
+  })
+  calleeConnectionName: string;
+
+  /**
+   * 连接器触发器启动器标题
+   */
+  @property({
+    objectRef: '',
+  })
+  title: string;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<ConnectorTriggerLauncher>) {
+    source = Object.assign({}, ConnectorTriggerLauncher.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): ConnectorTriggerLauncher {
+    return super.from(source, parentNode, parentKey) as ConnectorTriggerLauncher;
+  }
+
+  /**
+   * 设置calleeConnectionName
+   */
+  setCalleeConnectionName(calleeConnectionName: string) {
+    const object = {
+      calleeConnectionName,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  /**
+   * 设置连接器触发器启动器标题
+   */
+  setTitle(title: string) {
+    const object = {
+      title,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  get connector() {
+    const connectorName = this.calleeNamespace.split('.')?.[1]
+    return (this.getAncestor('App') as App)?.connectorDependencies?.find(connector => connector.name === connectorName);
+  }
+
+  get connection() {
+    return (this.getAncestor('App') as App)?.connections?.find(connection => connection.namespace === this.calleeNamespace && connection.name === (this as ConnectorTriggerLauncher).calleeConnectionName)
+  }
+
+  get connectorTrigger() {
+    return this.connector?.triggers?.find(trigger => trigger.name === this.calleeName)
+  }
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default ConnectorTriggerLauncher;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/ConnectorTrigger__.ts

@@ -3,6 +3,8 @@ import View from './View__';
 import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
+import Interface from './Interface__';
+import type InterfaceTriggerEvent from './InterfaceTriggerEvent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -47,12 +49,12 @@ export class ConnectorTrigger extends BaseNode {
   name: string = '';
 
   /**
-   * triggerType
+   * 连接器触发器标题
    */
   @property({
     objectRef: '',
   })
-  triggerType: string;
+  title: string = '';
 
   /**
    * triggerEvent
@@ -89,11 +91,11 @@ export class ConnectorTrigger extends BaseNode {
   }
 
   /**
-   * 设置triggerType
+   * 设置连接器触发器标题
    */
-  setTriggerType(triggerType: string) {
+  setTitle(title: string) {
     const object = {
-      triggerType,
+      title,
     };
     this.update({
       ...object,
@@ -150,6 +152,37 @@ export class ConnectorTrigger extends BaseNode {
     return this.getAncestor('Process') as Process;
   }
 
+  delete() {
+    let actionMsg = '删除触发器';
+    if (this.name) actionMsg += `“${this.name}”`;
+    this.app?.emit('collect:start', {
+      actionMsg,
+    });
+    super.delete();
+    const { inter } = this.triggerEvent as InterfaceTriggerEvent;
+    if (inter) {
+      (inter as Interface).deleteInterface();
+    }
+    // (this.triggerEvent as InterfaceTriggerEvent).inter.deleteInterface()
+    // this.traverseChildren(async (el) => {
+    //   if (el?.concept === 'CallQueryComponent') (el as CallQueryComponent).removeStructure();
+    //   // 仅仅针对 自定义连接器下的 Loigc，其他需要界定边界
+    //   const connector: Connector | null = el?.getAncestor?.('Connector') as Connector;
+    //   if (['CallAuthInterface', 'CallInterface'].includes(el?.concept) && connector) {
+    //     const { calleeName } = el as CallInterface;
+    //     const targetInterface = connector.interfaces.find((i) => i.name === calleeName) as Interface;
+    //     if (targetInterface) {
+    //       const refs = await (this.app as any)?.naslServer?._isHaveRef(targetInterface);
+    //       // 如果只有两个引用，则必然为自身以及当前logic引用，需要删除此接口
+    //       if (refs?.length <= 2) {
+    //         targetInterface.deleteInterface();
+    //       }
+    //     }
+    //   }
+    // });
+    this.app?.emit('collect:end');
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Connector__.ts

@@ -1231,6 +1231,12 @@ export class Connector extends Module {
     return utils.unique(name, this.getNamespaceExistingTitles(), undefined, false);
   }
 
+  // ================  为解决循环引用而将之前的自动生成代码移动到这里  END =================
+
+  // 获取连接器的命名空间前缀
+  get getNamespacePrefix() {
+    return `connector.${this.name}.`;
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/End__.ts

@@ -84,6 +84,7 @@ export class End extends LogicItem {
     let logic;
     switch (self.parentNode.concept) {
       case 'Logic':
+      case 'ConnectorLogic':
         ret = self.logic.returns[0];
         break;
       case 'AuthLogic':

package/src/concepts/Frontend__.ts

@@ -977,6 +977,7 @@ export class Frontend extends BaseNode {
       'van-uploader',
       'u-uploader',
       'u-validator',
+      'i-ico',
     ];
 
     // 判断绑定属性 是不是需要国际化

package/src/concepts/Integration__.ts

@@ -289,6 +289,12 @@ export class Integration extends BaseNode {
     };
   }
 
+  getConnectorExistingTitles(excludedList: Array<Connector> = []) {
+    const excludedSet = new Set(excludedList);
+    return ((this.connectors as Connector[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.title);
+  }
+
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/InterfaceTriggerEvent__.ts

@@ -0,0 +1,88 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+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 AbstractInterface from './AbstractInterface__';
+import TriggerEvent from './TriggerEvent__';
+
+/**
+ * 触发器api回调事件
+ */
+@concept('触发器api回调事件')
+export class InterfaceTriggerEvent extends TriggerEvent {
+  /** 类名 */
+  static readonly ConceptName: string = 'InterfaceTriggerEvent';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['TriggerEvent', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'InterfaceTriggerEvent';
+  /**
+   * 开放的接口信息
+   */
+  @property({
+    objectRef: 'AbstractInterface',
+  })
+  inter: AbstractInterface;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<InterfaceTriggerEvent>) {
+    source = Object.assign({}, InterfaceTriggerEvent.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): InterfaceTriggerEvent {
+    return super.from(source, parentNode, parentKey) as InterfaceTriggerEvent;
+  }
+
+  /**
+   * 设置开放的接口信息
+   */
+  setInter(inter: AbstractInterface) {
+    inter._delete();
+    const relationOptions = { parentNode: this, parentKey: 'inter' };
+    Object.assign(inter, relationOptions);
+    const object = {
+      inter,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default InterfaceTriggerEvent;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Interface__.ts

@@ -88,7 +88,7 @@ export class Interface extends ImportedInterface {
   @property({
     objectRef: '',
   })
-  method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 
   /**
    * 接口描述
@@ -167,7 +167,7 @@ export class Interface extends ImportedInterface {
   /**
    * 设置接口方法
    */
-  setMethod(method: 'GET' | 'POST' | 'PUT' | 'DELETE') {
+  setMethod(method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH') {
     const object = {
       method,
     };
@@ -988,8 +988,8 @@ export class Interface extends ImportedInterface {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里
     if (this.parentNode?.concept === 'Connector') {
-      // return `connector.${this.parentNode.name}.interfaces`;
-      return `extensions.${this.parentNode.name}.interfaces`;
+      return `connector.${this.parentNode.name}.interfaces`;
+      // return `extensions.${this.parentNode.name}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
@@ -1008,8 +1008,8 @@ export class Interface extends ImportedInterface {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
-      // return `connector.${this.parentNode.tsName}.interfaces`;
-      return `extensions.${this.parentNode.tsName}.interfaces`;
+      return `connector.${this.parentNode.tsName}.interfaces`;
+      // return `extensions.${this.parentNode.tsName}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getTsNamespace();
@@ -1062,8 +1062,9 @@ export class Interface extends ImportedInterface {
   }
 
   deleteRefStructures(includeNameList?: string[]) {
-    if (asserts.isConnector(this.upperNode)) {
-      const module = this.upperNode;
+    const connector = this.getAncestor('Connector') as Connector;
+    if (connector) {
+      const module = connector;
       const oldStructuresSet = this.getRefStructures(module.structures, includeNameList);
       oldStructuresSet.forEach((s: Structure) => s.delete());
     }

package/src/concepts/LogicItem__.ts

@@ -21,6 +21,7 @@ import Logic from './Logic__';
 import Connector from './Connector__';
 import AuthLogic from './AuthLogic__';
 import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
+import type ConnectorLogic from './ConnectorLogic__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -272,6 +273,12 @@ export abstract class LogicItem extends BaseNode {
   get AuthLogicForCallInterface() {
     return this.getAncestor('AuthLogicForCallInterface') as AuthLogicForCallInterface;
   }
+  /**
+   * 祖先 ConnectorLogic
+   */
+  get ConnectorLogic() {
+    return this.getAncestor('ConnectorLogic') as ConnectorLogic;
+  }
 
   get completeName() {
     return this.name;
@@ -373,7 +380,7 @@ export abstract class LogicItem extends BaseNode {
   delete() {
     let actionMsg = '删除逻辑项';
     if (this.name) actionMsg += `“${this.name}”`;
-    this.app?.emit('collect:start', {
+    this.app?.emit?.('collect:start', {
       actionMsg,
     });
     super.delete();

package/src/concepts/Logic__.ts

@@ -83,7 +83,7 @@ export class Logic extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' | 'BusinessLogic';
+  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' | 'BusinessLogic' | 'ConnectorLogic';
   /**
    * 逻辑名称
    */
@@ -1690,6 +1690,7 @@ export class Logic extends BaseNode {
         }
       }
     });
+
     // 兼容 return 没有类型情况
     if (self.returns.length && self.returns[0].typeAnnotation) {
       code += ': ';
@@ -1697,10 +1698,10 @@ export class Logic extends BaseNode {
         returnOrigin('');
     }
     code += '{\n';
-    if (self.exportInterface) {
-      code += indent((state?.tabSize || 0) + 1);
-      code += `let exportInterface = app.interfaces.${self.exportInterface.name};\n`
-    }
+    // if (self.exportInterface) {
+    //   code += indent((state?.tabSize || 0) + 1);
+    //   code += `let exportInterface = app.interfaces.${self.exportInterface.name};\n`
+    // }
     // 用于虚拟节点的查找引用
     if (Array.isArray(self.virtualParams)) {
       for (const param of self.virtualParams) {

package/src/concepts/MatchCase__.ts

@@ -223,6 +223,7 @@ export class MatchCase extends LogicItem {
   getLogicItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
   }
+
   /**
    * 插入逻辑项
    * @internal

package/src/concepts/Module__.ts

@@ -3,8 +3,9 @@ const moduleNameSpace = {
   dependencies: 'extensions',
   interfaceDependencies: 'apis',
   componentDependencies: 'components',
+  connectorDependencies: 'connector',
 };
-type ModuleKeyType = 'dependencies' | 'interfaceDependencies' | 'componentDependencies';
+type ModuleKeyType = 'dependencies' | 'interfaceDependencies' | 'componentDependencies' | 'connectorDependencies';
 import type { AuthInterface } from './AuthInterface__';
 import type ConfigProperty from './ConfigProperty__';
 import type Interface from './Interface__';

package/src/concepts/MsgTriggerLauncher__.ts

@@ -12,13 +12,13 @@ import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 
 import Argument from './Argument__';
-import TriggerLauncher from './TriggerLauncher__';
+import ConnectorTriggerLauncher from './ConnectorTriggerLauncher__';
 
 /**
  * 触发器启动器消息
  */
 @concept('触发器启动器消息')
-export class MsgTriggerLauncher extends TriggerLauncher {
+export class MsgTriggerLauncher extends ConnectorTriggerLauncher {
   /** 类名 */
   static readonly ConceptName: string = 'MsgTriggerLauncher';
   /**
@@ -27,7 +27,7 @@ export class MsgTriggerLauncher extends TriggerLauncher {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['TriggerLauncher', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['ConnectorTriggerLauncher', 'TriggerLauncher', 'BaseNode'];
 
   /**
    * 产品概念
@@ -45,14 +45,6 @@ export class MsgTriggerLauncher extends TriggerLauncher {
   })
   properties: Array<Argument> = [];
 
-  /**
-   * calleeConnectionName
-   */
-  @property({
-    objectRef: '',
-  })
-  calleeConnectionName: string;
-
   /**
    * @param source 需要合并的部分参数
    */
@@ -78,18 +70,6 @@ export class MsgTriggerLauncher extends TriggerLauncher {
     });
   }
 
-  /**
-   * 设置calleeConnectionName
-   */
-  setCalleeConnectionName(calleeConnectionName: string) {
-    const object = {
-      calleeConnectionName,
-    };
-    this.update({
-      ...object,
-    });
-  }
-
   getArgumentExistingNames(excludedList: Array<Argument> = []) {
     const excludedSet = new Set(excludedList);
     return ((this.properties as Argument[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -280,6 +260,10 @@ export class MsgTriggerLauncher extends TriggerLauncher {
     return this.getAncestor('Module') as Module;
   }
 
+  get connection() {
+    return this.rootNode?.connections?.find((item) => item.name === this.calleeConnectionName);
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/OqlQueryComponent__.ts

@@ -316,23 +316,24 @@ export class OqlQueryComponent extends LogicItem {
         };
       }
 
-      return http.post('/api/v1/querydebug/generate/typescript', {
-        appId: 'myAppId',
-        oqlIdentifier: 'myoqlIdentifier',
-        dataSourceName: this.dataSource,
-        oql: this.code,
-        ideVersion: this.app.ideVersion,
-        dataSourceNasl,
-        typeScriptStartLine: 1,
-        typeScriptStartLineColumn: 1,
-      })
-      .then(({ data }: any) => {
-        this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
-      })
-      .catch((err) => {
-        logger.error('Oql 请求失败', err.toString());
-        this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
-      });
+      return http
+        .post('/api/v1/querydebug/generate/typescript', {
+          appId: 'myAppId',
+          oqlIdentifier: 'myoqlIdentifier',
+          dataSourceName: this.dataSource,
+          oql: this.code,
+          ideVersion: this.app.ideVersion,
+          dataSourceNasl,
+          typeScriptStartLine: 1,
+          typeScriptStartLineColumn: 1,
+        })
+        .then(({ data }: any) => {
+          this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
+        })
+        .catch((err) => {
+          logger.error('Oql 请求失败', err.toString());
+          this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
+        });
     }
     this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
   }

package/src/concepts/Param__.ts

@@ -451,7 +451,9 @@ export class Param extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || this._readonly;
+    // 由于 getAncestor 方法的更新，导致conenctor 节点也会 在this.module 里面，
+    // 所以需要加上connector的判断
+    return (!!this.module && !this.connector) || this._readonly;
   }
 
   set readonly(val) {

package/src/concepts/Structure__.ts

@@ -609,8 +609,8 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
-      // return `connector.${this.parentNode.name}.structures`;
-      return `extensions.${this.parentNode.name}.structures`;
+      return `connector.${this.parentNode.name}.structures`;
+      // return `extensions.${this.parentNode.name}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
@@ -629,8 +629,8 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
-      // return `connector.${this.parentNode.tsName}.structures`;
-      return `extensions.${this.parentNode.tsName}.structures`;
+      return `connector.${this.parentNode.tsName}.structures`;
+      // return `extensions.${this.parentNode.tsName}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getTsNamespace();

package/src/concepts/TriggerEvent__.ts

@@ -16,14 +16,14 @@ import TypeAnnotation from './TypeAnnotation__';
  * 触发器事件
  */
 @concept('触发器事件')
-export class TriggerEvent extends BaseNode {
+export abstract class TriggerEvent extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'TriggerEvent';
   /**
    * 是否为抽象类
    * 抽象类不能产生 concept: string
    */
-  static isAbstract: boolean = false;
+  static isAbstract: boolean = true;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -32,7 +32,7 @@ export class TriggerEvent extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'TriggerEvent' | 'MsgTriggerEvent';
+  readonly concept!: 'MsgTriggerEvent' | 'InterfaceTriggerEvent';
   /**
    * 触发器事件名称
    */