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

package/src/concepts/CallAuthInterface__.ts

@@ -13,6 +13,8 @@ import { getNodeByNodeCallee } from '../automate/engine/utils.js';
 import type AuthLogicForCallInterface from './AuthLogicForCallInterface__';
 import type AuthInterface from './AuthInterface__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
+import type App from './App__';
+import type Connector from './Connector__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -421,7 +423,12 @@ export class CallAuthInterface extends CallInterface {
     if (!authLogic) {
       return [];
     }
-    const targetAuthLogic = this.app.authLogicsForCallInterface.find((logic) => logic.name === authLogic);
+    let source: App | Connector = this.app;
+    if (this.connector) {
+      source = this.connector;
+    }
+
+    const targetAuthLogic = source.authLogicsForCallInterface.find((logic) => logic.name === authLogic);
     const logicParam: Param[] = targetAuthLogic?.authParams || [];
     const Arguments: Argument[] = [];
 

package/src/concepts/CallInterface__.ts

@@ -15,7 +15,9 @@ import type InterfaceParam from './InterfaceParam__';
 import type Structure from './Structure__';
 import type Module from './Module__';
 import type AuthInterface from './AuthInterface__';
+import type ConnectorLogic from './ConnectorLogic__';
 import type { MemberExpression } from './MemberExpression__';
+import type AbstractInterface from './AbstractInterface__';
 import type Frontend from './Frontend__';
 import type Connector from './Connector__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
@@ -230,6 +232,8 @@ export class CallInterface extends LogicItem {
 
   // 删除调用接口时且接口无引用，删除接口和数据结构
   async deleteCallNode() {
+    // 如果是连接器下面，则不需要自动删除，得用户手动删除
+    if (this.connector) return;
     if (this.calleeKey !== '__IDENTIFIER__' && !this.__authDelete) {
       (this as any).__deleteCallNodeTimer = setTimeout(async () => {
         clearTimeout((this as any).__deleteCallNodeTimer);
@@ -343,13 +347,13 @@ export class CallInterface extends LogicItem {
     const [, _name, , _interfaceName] = calleewholeKey.split('.');
     let _module: Module | Connector;
     // 由于自定义连接器的引入，目前在 集成中心下也存在着一部分接口
-    // 因此，需要额外判断，如果是自定义连接器需要拿 app.dependencies 中的接口或者 app.integration 中connector下面的接口
+    // 因此，需要额外判断，如果是自定义连接器需要拿 app.connectorDependencies 中的接口或者 app.integration 中connector下面的接口
     const isCustomConnector = this.getAncestor('Connector');
     const isInIntegration = this.getAncestor('Integration');
     if (isCustomConnector && isInIntegration) {
       _module = app?.integration?.connectors?.find?.((item) => item.name === _name);
     } else if (isCustomConnector && !isInIntegration) {
-      _module = app?.dependencies?.find?.((item) => item.name === _name);
+      _module = app?.connectorDependencies?.find?.((item) => item.name === _name);
     } else {
       // default
       _module = app?.interfaceDependencies?.find?.((item) => item.name === _name);
@@ -653,20 +657,27 @@ export class CallInterface extends LogicItem {
     let node;
     // 如果是其余app下自定义逻辑
     try {
-      node = getNodeByNodeCallee(this.app, this.calleewholeKey, (key: any, tempPoint: any) => {
-        // 处理 NASL 中未定义的假的节点
-        if (key === tempPoint.name) {
+      // connector 下的需要从当前connector 下获取
+      if (this.connector) {
+        node = this.connector.interfaces?.find((item) => {
+          return this.calleewholeKey.endsWith(item.name);
+        });
+      } else {
+        node = getNodeByNodeCallee(this.app, this.calleewholeKey, (key: any, tempPoint: any) => {
+          // 处理 NASL 中未定义的假的节点
+          if (key === tempPoint.name) {
+            return {
+              tempPoint,
+              state: 1,
+            };
+          }
+          const t = tempPoint[key];
           return {
-            tempPoint,
-            state: 1,
+            tempPoint: t,
+            state: Array.isArray(t) ? 2 : 1,
           };
-        }
-        const t = tempPoint[key];
-        return {
-          tempPoint: t,
-          state: Array.isArray(t) ? 2 : 1,
-        };
-      });
+        });
+      }
     } catch (err) {}
     return node;
   }
@@ -715,13 +726,13 @@ export class CallInterface extends LogicItem {
     const _interfaceName = _arr[3];
     let _module: Module | Connector;
     // 由于自定义连接器的引入，目前在 集成中心下也存在着一部分接口
-    // 因此，需要额外判断，如果是自定义连接器需要拿 app.dependencies 中的接口或者 app.integration 中connector下面的接口
+    // 因此，需要额外判断，如果是自定义连接器需要拿 app.connectorDependencies 中的接口或者 app.integration 中connector下面的接口
     const isCustomConnector = this.getAncestor('Connector');
     const isInIntegration = this.getAncestor('Integration');
     if (isCustomConnector && isInIntegration) {
       _module = this.app?.integration?.connectors?.find?.((item) => item.name === _name);
     } else if (isCustomConnector && !isInIntegration) {
-      _module = this.app?.dependencies?.find?.((item) => item.name === _name);
+      _module = this.app?.connectorDependencies?.find?.((item) => item.name === _name);
     } else {
       // default
       _module = this.app.interfaceDependencies.find((item) => item.name === _name);
@@ -733,8 +744,102 @@ export class CallInterface extends LogicItem {
     };
   }
 
+  reNameInterface(
+    itfData: Partial<AbstractInterface>,
+    newName: string,
+    structureNameMap: Map<string, string>,
+  ): Partial<AbstractInterface> {
+    itfData.name = newName;
+    // 全量更新参数引用数据结构名
+    // 结构体重命名
+    utils.traverse(
+      ({ node }: { node: any }) => {
+        if (node?.concept === 'TypeAnnotation' && node?.typeKind === 'reference') {
+          // typeNamespace 全部统一为当前的连接器
+          node.typeNamespace = `connector.${this.connector.name}.structures`;
+          node.typeName = structureNameMap.get(node.typeName) || node.typeName;
+        }
+      },
+      { node: itfData },
+      {
+        mode: 'anyObject',
+        excludedKeySet: new Set(['parentNode', '_events', 'globalDataMap', 'havingPlayground', 'wherePlayground']),
+      },
+    );
+    return itfData;
+  }
+
+  // 重新命名数据结构
+  reNameStructureAndRetureNamesMap(structuresData: Partial<Structure>[], moduleName: string): Map<string, string> {
+    const nameMap = new Map<string, string>();
+    structuresData.forEach((structureData) => {
+      const { name } = structureData;
+      const newName = this.connector.getStructureUniqueName(`${moduleName}__${name}`);
+      structureData.name = newName;
+      nameMap.set(name, newName);
+    });
+    structuresData.forEach((structureData) => {
+      // 结构体重命名
+      utils.traverse(
+        ({ node }: { node: any }) => {
+          if (node?.concept === 'TypeAnnotation' && node?.typeKind === 'reference') {
+            // typeNamespace 全部统一为当前的连接器
+            node.typeNamespace = `connector.${this.connector.name}.structures`;
+            node.typeName = nameMap.get(node.typeName) || node.typeName;
+          }
+        },
+        { node: structureData },
+        {
+          mode: 'anyObject',
+          excludedKeySet: new Set(['parentNode', '_events', 'globalDataMap', 'havingPlayground', 'wherePlayground']),
+        },
+      );
+    });
+    return nameMap;
+  }
+
+  // 导入接口到连接器
+  createInterfaceInConnector({ moduleData, selectedModule }: { moduleData: Partial<Module>; selectedModule: any }) {
+    if (!this.connector) return;
+    const modelName = moduleData.name;
+    const itfData = moduleData.interfaces[0] as unknown as Partial<Interface>;
+    const structurseData = moduleData.structures;
+    const structureNameMap = this.reNameStructureAndRetureNamesMap(structurseData, modelName);
+    const { devDomain } = selectedModule || {};
+    if (devDomain) {
+      itfData.path = `${devDomain}${itfData.path}`;
+    }
+
+    // modelName__itfName
+    const targetItfName = this.connector.getInterfaceUniqueName(`${modelName}__${itfData.name}`);
+    this.app.emit('collect:start', { actionMsg: '增加接口到连接器' });
+    // 不支持 DUBBO 的接口
+    const Interface = getConceptConstructor('Interface');
+    const newItf = new Interface(this.reNameInterface(itfData, targetItfName, structureNameMap) as Interface);
+
+    structurseData.forEach((structureData) => {
+      this.connector.addStructure(structureData);
+    });
+    this.connector.addInterface(newItf as Interface);
+    this.setCallee(newItf as Interface);
+    this.app.emit('collect:end');
+  }
+
   // 导入接口
   async createOrUpdateInterface({ moduleData, selectedModule }: { moduleData: Partial<Module>; selectedModule: any }) {
+    const connectorLogic = this.getAncestor('ConnectorLogic') as ConnectorLogic;
+    // 如果是pipleline逻辑，需要将当前的接口复制一份到连接器下
+    // 命名规则为： modelName + interfaceName
+    const isInPiple = connectorLogic?.kind === 'pipeline';
+    // 鉴权方式，如果是连接器下面的，也需要 进入下面的逻辑
+    const isInConnector = this.getAncestor('Connector') as Connector;
+    const isInAuthInterface = this.getAncestor('AuthInterface');
+    const isInAuthLogicForCallInterface = this.getAncestor('AuthLogicForCallInterface');
+    if (isInPiple || (isInAuthInterface && isInConnector) || (isInAuthLogicForCallInterface && isInConnector)) {
+      this.createInterfaceInConnector({ moduleData, selectedModule });
+      return;
+    }
+
     const moduleName = moduleData.name;
     const itfData = moduleData.interfaces[0];
     this.app.emit('collect:start', { actionMsg: '调用接口' });

package/src/concepts/Connection__.ts

@@ -339,7 +339,7 @@ export class Connection extends BaseNode {
   /**
    * 获取connector 类型
    */
-  get connector() {
+  get connector(): Connector {
     return getNodeByNodeCallee(this.rootNode, this.namespace) || ({} as Connector);
   }
   getConnectorType(): String {

package/src/concepts/ConnectorLogic__.ts

@@ -0,0 +1,84 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 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 Logic from './Logic__';
+
+/**
+ * 连接器操作逻辑
+ */
+@concept('连接器操作逻辑')
+export class ConnectorLogic extends Logic {
+  /** 类名 */
+  static readonly ConceptName: string = 'ConnectorLogic';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['Logic', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'ConnectorLogic';
+  /**
+   * 模式类型
+   */
+  @property({
+    objectRef: '',
+  })
+  kind: 'http' | 'pipeline';
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<ConnectorLogic>) {
+    source = Object.assign({}, ConnectorLogic.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): ConnectorLogic {
+    return super.from(source, parentNode, parentKey) as ConnectorLogic;
+  }
+
+  /**
+   * 设置模式类型
+   */
+  setKind(kind: 'http' | 'pipeline') {
+    const object = {
+      kind,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default ConnectorLogic;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

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/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());
     }