@lcap/nasl 3.4.0-beta.3 → 3.4.0-beta.4

package/src/concepts/Interface__.ts

@@ -3,6 +3,7 @@ import Namespace from './Namespace__';
 import TypeAnnotation from './TypeAnnotation__';
 import Structure from './Structure__';
 import Param from './Param__';
+import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -18,11 +19,13 @@ import Return from './Return__';
 import BindAttribute from './BindAttribute__';
 import Module from './Module__';
 import Connector from './Connector__';
+import InterfaceFromExample from './InterfaceFromExample__';
 import App from './App__';
 import View from './View__';
 import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
+import AbstractInterface from './AbstractInterface__';
 
 /**
  * 接口
@@ -30,10 +33,13 @@ import Process from './Process__';
 @className
 @concept('接口')
 // @ts-ignore
-export class Interface extends BaseNode {
+export class Interface extends AbstractInterface {
   /** 类名 */
   static readonly ConceptName = 'Interface';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['AbstractInterface', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -147,6 +153,12 @@ export class Interface extends BaseNode {
   get process() {
     return this.getAncestor('Process') as Process;
   }
+  /**
+   * 祖先 InterfaceFromExample
+   */
+  get interfaceFromExample() {
+    return this.getAncestor('InterfaceFromExample') as InterfaceFromExample;
+  }
 
   /**
    * @param source 需要合并的部分参数
@@ -161,17 +173,6 @@ export class Interface extends BaseNode {
     return super.from(source, parentNode, parentKey) as Interface;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeInterface?.(this);
-    }
-    return params;
-  }
   /**
    * 设置接口名称
    */
@@ -551,7 +552,8 @@ export class Interface extends BaseNode {
       // @ts-ignore
       const n = interfaceParam.__v_raw || interfaceParam;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -603,7 +605,8 @@ export class Interface extends BaseNode {
       // @ts-ignore
       const n = ret.__v_raw || ret;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -655,7 +658,8 @@ export class Interface extends BaseNode {
       // @ts-ignore
       const n = bindAttribute.__v_raw || bindAttribute;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -801,7 +805,7 @@ export class Interface extends BaseNode {
     // 找出其他接口引用的数据结构
     (this.parentNode as Module).interfaces
       .filter((itf) => itf !== this)
-      .forEach((itf) => {
+      .forEach((itf: Interface) => {
         const params = itf.params || [];
         const returns = itf.returns || [];
         [...params, ...returns].forEach((p) => {
@@ -870,9 +874,14 @@ export class Interface extends BaseNode {
    * @param name 一般不用传，用于 rename
    */
   getEmbeddedFilePath(name = this.name) {
+    // 自定义连接器 编辑态文件对应parentKey 为 connectors，
+    // 稳定态文件对应parentKey 为 dependencies
     // 连接器相关的接口，本身没有 module 属性故，需要额外处理
-    if (this.parentNode.concept === 'Connector') {
-      return `/embedded/${this.app.name}/dependencies/${this.parentNode.name}/interfaces/${name}.ts`;
+
+    // 2023/11/08 由于新引入了一种 InterfaceFromExample 类型，故这里 parentNode 不在是
+    // Connector，为了保证使用旧逻辑，这里选择直接获取祖先节点。
+    if (this.connector) {
+      return `/embedded/${this.app.name}/${this.connector.parentKey}/${this.connector.name}/interfaces/${name}.ts`;
       ``;
     }
     const _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
@@ -958,11 +967,18 @@ export class Interface extends BaseNode {
     if (excludeds.includes(this.name)) {
       return `_${this.name}`;
     }
+    // 来自集成中心，且是连接内部的逻辑，则认为是编辑态的，需要加上后缀
+    if (this.connector && this.integration) {
+      return `${this.name}${CUSTOM_CONNECTOR_EDITABLE_SUFFIX}`;
+    }
     return this.name;
   }
 
   @withSourceMap()
   toEmbeddedTS(state = createCompilerState()): string {
+    // 是否含有 Module 相关的祖先节点，相关均不会翻译出 let logic =xxx;
+    const hasModuleLikeAncestor = !!(this.module || this.connector);
+
     let code = '';
     const getCheckerCode = () => {
       if (this.validation) {
@@ -996,6 +1012,7 @@ export class Interface extends BaseNode {
       }
     });
     code += `):`;
+
     if (this.returns && this.returns.length > 0) {
       this.returns.forEach((ret) => {
         code += ret.typeAnnotation.toEmbeddedTS(shiftState(state, code));
@@ -1003,7 +1020,7 @@ export class Interface extends BaseNode {
 
       code += '{\n';
       getCheckerCode();
-      code += this.module
+      code += hasModuleLikeAncestor
         ? ''
         : `let logic =${(this.parentNode as Namespace).getTsNamespace()}.logics.${this.originLogicName};\n`;
       code += 'let ';
@@ -1015,7 +1032,7 @@ export class Interface extends BaseNode {
     } else {
       code += 'void {\n';
       getCheckerCode();
-      code += this.module
+      code += hasModuleLikeAncestor
         ? ''
         : `let logic =${(this.parentNode as Namespace).getTsNamespace()}.logics.${this.originLogicName};\n`;
       code += '};';
@@ -1027,9 +1044,11 @@ export class Interface extends BaseNode {
   getNamespace() {
     // 针对 Connector 下的 Interface 需要做额外的兼容处理
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
-    // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
-    if (this.parentNode?.concept === 'Connector') {
-      return `extensions.${this.parentNode.name}.interfaces`;
+    // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里
+    // 2023/11/08 由于新引入了一种 InterfaceFromExample 类型，故这里 parentNode 不在是
+    // Connector，为了保证使用旧逻辑，这里选择直接获取祖先节点。
+    if (this.connector) {
+      return `extensions.${this.connector.name}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
@@ -1047,8 +1066,10 @@ export class Interface extends BaseNode {
     // 针对 Connector 下的 Interface 需要做额外的兼容处理
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
-    if (this.parentNode?.concept === 'Connector') {
-      return `extensions.${this.parentNode.tsName}.interfaces`;
+    // 2023/11/08 由于新引入了一种 InterfaceFromExample 类型，故这里 parentNode 不在是
+    // Connector，为了保证使用旧逻辑，这里选择直接获取祖先节点。
+    if (this.connector) {
+      return `extensions.${this.connector.tsName}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getTsNamespace();
@@ -1113,6 +1134,11 @@ export class Interface extends BaseNode {
     this.delete();
   }
 
+  // 是否来自于 集成中心
+  get integration() {
+    return this.getAncestor('Integration');
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/JSBlock__.ts

@@ -21,6 +21,9 @@ export class JSBlock extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'JSBlock';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */

package/src/concepts/JavaLogic__.ts

@@ -21,6 +21,9 @@ export class JavaLogic extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'JavaLogic';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */

package/src/concepts/LogicItem__.ts

@@ -35,6 +35,9 @@ export class LogicItem extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'LogicItem';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */

package/src/concepts/Logic__.ts

@@ -20,6 +20,9 @@ import MatchCase from './MatchCase__';
 import TypeAnnotation from './TypeAnnotation__';
 import CallInterface from './CallInterface__';
 import CallLogic from './CallLogic__';
+import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
+import type Interface from './Interface__';
+
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -44,7 +47,6 @@ import ProcessElement from './ProcessElement__';
 import App from './App__';
 import Frontend from './Frontend__';
 import Process from './Process__';
-
 /**
  * 逻辑
  */
@@ -55,6 +57,9 @@ export class Logic extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Logic';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -1169,7 +1174,8 @@ export class Logic extends BaseNode {
       // @ts-ignore
       const n = transactional.__v_raw || transactional;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -1221,7 +1227,8 @@ export class Logic extends BaseNode {
       // @ts-ignore
       const n = typeParam.__v_raw || typeParam;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -1273,7 +1280,8 @@ export class Logic extends BaseNode {
       // @ts-ignore
       const n = param.__v_raw || param;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -1325,7 +1333,8 @@ export class Logic extends BaseNode {
       // @ts-ignore
       const n = ret.__v_raw || ret;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -1377,7 +1386,8 @@ export class Logic extends BaseNode {
       // @ts-ignore
       const n = variable.__v_raw || variable;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -1426,7 +1436,8 @@ export class Logic extends BaseNode {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -1742,6 +1753,15 @@ export class Logic extends BaseNode {
     return this.toEmbeddedTS(state, 'noExport');
   }
 
+  get tsName() {
+    // 来自集成中心，且是连接内部的逻辑，则认为是编辑态的，需要加上后缀
+    if (this.connector && this.integration) {
+      return `${this.name}${CUSTOM_CONNECTOR_EDITABLE_SUFFIX}`;
+    }
+    // 由于Logic name 已经是符合函数预期的，因此不再需要做格式化
+    return this.name;
+  }
+
   @withSourceMap()
   toEmbeddedTS(state?: TranslatorState, prefix?: string, hideDefaultValue?: boolean): string {
     // 如果传了不要前缀那就为空， 要不用传进来的，要是都没有就默认导出
@@ -1750,11 +1770,11 @@ export class Logic extends BaseNode {
     const IDENTIFIERMAP = new Set();
 
     if (!prefix) {
-      code += `export function ${this.name}`;
+      code += `export function ${this.tsName}`;
     } else if (prefix === 'noExport') {
-      code += `function ${this.name}`;
+      code += `function ${this.tsName}`;
     } else if (prefix === 'inObject') {
-      code += `${this.name}`;
+      code += `${this.tsName}`;
     }
     if (this.typeParams?.length) {
       code += '<';
@@ -1852,7 +1872,7 @@ export class Logic extends BaseNode {
       });
 
     this.variables.forEach((variable) => {
-      const ts = variable.defaultValue?.expression?.toEmbeddedTS();
+      const ts = variable.defaultValue?.toEmbeddedTS();
       if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
         IDENTIFIERMAP.add(variable);
       }
@@ -1864,7 +1884,7 @@ export class Logic extends BaseNode {
     });
 
     this.returns.forEach((ret) => {
-      const ts = ret.defaultValue?.expression?.toEmbeddedTS();
+      const ts = ret.defaultValue?.toEmbeddedTS();
       if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
         IDENTIFIERMAP.add(ret);
       }
@@ -1967,7 +1987,7 @@ export class Logic extends BaseNode {
     // 参数的默认值是__IDENTIFIER__或者__IDENTIFIER__()时不赋默认值，但是需要ts翻译出来进行报错校验
     if (!hideDefaultValue) {
       IDENTIFIERMAP.forEach((node: Variable | Return) => {
-        code += node.defaultValue.expression.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        code += node.defaultValue.toEmbeddedTS(shiftState(state, code, { inline: true }));
         code += '; ';
       });
       code += '\n';
@@ -2120,19 +2140,21 @@ ${indent(state.tabSize)} */\n`;
         code += variable.toNaturalTS(shiftState(state, code, { inline: true }));
         code += ';\n';
       });
-
       this.returns.forEach((ret) => {
         code += `${indent(state.tabSize + 1)}let `;
         code += ret.toNaturalTS(shiftState(state, code, { inline: true }));
         code += ';\n';
       });
 
-      code += `${indent(state.tabSize + 1)}// 当前位置\n`;
       if (!this.body.length && this.returns.length) {
+        if (!state.focusedNodePath || `${this.nodePath}.body[0]` === state.focusedNodePath)
+          code += `${indent(state.tabSize + 1)}// 当前位置\n`;
         code += `${indent(state.tabSize + 1)}return ${this.returns[0].name};\n`;
       } else {
         this.body.forEach((item) => {
           let partialCode = '';
+
+          if (!state.focusedNodePath && item.concept === 'End') code += `${indent(state.tabSize + 1)}// 当前位置\n`;
           if (item.toNaturalTS) {
             partialCode = item.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
           } else if (item.toEmbeddedTS) {
@@ -2144,7 +2166,6 @@ ${indent(state.tabSize)} */\n`;
           }
         });
       }
-
       code += `${indent(state.tabSize)}}`;
     }
     if (prefix === 'inObject') {
@@ -2161,7 +2182,7 @@ ${indent(state.tabSize)} */\n`;
     // 调用接口，参数替换成 null
     if (rightNode instanceof CallInterface) {
       const { _interface } = rightNode.getModuleInterface();
-      return _interface ? `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})` : null;
+      return _interface ? `${rightNode.tsCalleeKey}(${(_interface as Interface).params.map(() => 'null').join(',')})` : null;
     }
 
     // 调用服务端逻辑，参数替换成 null
@@ -2198,6 +2219,7 @@ ${indent(state.tabSize)} */\n`;
       if ($1.includes(`,${variable},`)) fnCode = $1.replaceAll(`,${variable},`, `,${replaceCode},`);
       if ($1.includes(`,${variable}.`)) fnCode = $1.replaceAll(`,${variable}.`, `,${replaceCode}.`);
       if ($1.includes(`,${variable})`)) fnCode = $1.replaceAll(`,${variable})`, `,${replaceCode})`);
+      if ($1.includes(`...[${variable}.`)) fnCode = $1.replaceAll(`...[${variable}.`, `...[${replaceCode}.`);
       return fnCode;
     });
   }
@@ -2331,6 +2353,8 @@ ${indent(state.tabSize)} */\n`;
     if (this.module) {
       _path = `/${this.module.parentKey}/${this.module.name}`;
     } else if (this.connector) {
+      // 自定义连接器 编辑态文件对应parentKey 为 connectors，
+      // 稳定态文件对应parentKey 为 dependencies
       // 自定义连接器有分组的概念因此，需要做文件夹处理
       if (this.connector.connectorKind === 'app') {
         _path = `/${this.connector.parentKey}/${this.connector.name}/${this.parentNode.name}`;
@@ -2435,7 +2459,7 @@ ${indent(state.tabSize)} */\n`;
       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);
+        const targetInterface = connector.interfaces.find((i) => i.name === calleeName) as Interface;
         if (targetInterface) {
           const refs = await (this.app as any)?.naslServer?._isHaveRef(targetInterface);
           // 如果只有两个引用，则必然为自身以及当前logic引用，需要删除此接口
@@ -2455,7 +2479,7 @@ ${indent(state.tabSize)} */\n`;
   isSmpty: boolean = false;
 
   get exportInterface() {
-    return (this.rootNode as App)?.interfaces?.find((item) => item.originLogicName === this.name);
+    return (this.rootNode as App)?.interfaces?.find((item) => (item as unknown as Interface).originLogicName === this.name);
   }
 
   get pathName(): string {
@@ -2544,6 +2568,11 @@ ${indent(state.tabSize)} */\n`;
     return findHasError;
   }
 
+  // 是否来自于 集成中心
+  get integration() {
+    return this.getAncestor('Integration');
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/MatchCase__.ts

@@ -28,6 +28,9 @@ export class MatchCase extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'MatchCase';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -558,7 +561,8 @@ export class MatchCase extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -610,7 +614,8 @@ export class MatchCase extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -700,11 +705,11 @@ export class MatchCase extends LogicItem {
     }
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '';
     if (Array.isArray(this.patterns)) {
       this.patterns.forEach((pattern, index) => {
-        code += pattern.toUI?.();
+        code += pattern.toUI?.(state, hideDetails);
         if (index !== this.patterns.length - 1) {
           code += ' 或 ';
         }
@@ -714,7 +719,7 @@ export class MatchCase extends LogicItem {
       code += ` => `;
       this.body.forEach((logicItem, bodyIndex) => {
         if (bodyIndex === this.body.length - 1 && logicItem.concept !== 'Assignment') {
-          code += ` ${logicItem.toUI?.()} `;
+          code += ` ${logicItem.toUI?.(state, hideDetails)} `;
         }
       });
       code += `; `;
@@ -910,6 +915,8 @@ export class MatchCase extends LogicItem {
               }),
             )}\n`;
           });
+          if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
+            code += `${indent(state.tabSize + 1)}// 当前位置\n`;
         }
         code += `${indent(state.tabSize)}}`;
       } else {
@@ -926,6 +933,8 @@ export class MatchCase extends LogicItem {
             }),
           )}\n`;
         });
+        if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
+          code += `${indent(state.tabSize + 1)}// 当前位置\n`;
         code += `${indent(state.tabSize)}}\n`;
       }
     } else {
@@ -940,6 +949,8 @@ export class MatchCase extends LogicItem {
           }),
         )}\n`;
       });
+      if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
+        code += `${indent(state.tabSize + 1)}// 当前位置\n`;
       code += '\n';
     }
 

package/src/concepts/Match__.ts

@@ -29,6 +29,9 @@ export class Match extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'Match';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -226,7 +229,8 @@ export class Match extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -639,15 +643,15 @@ export class Match extends LogicItem {
     //        return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '匹配 ';
     if (this.expression) {
-      code += this.expression.toUI?.();
+      code += this.expression.toUI?.(state, hideDetails);
     }
     if (Array.isArray(this.cases)) {
       code += ' { ';
       this.cases.forEach((item, index) => {
-        code += item?.toUI?.();
+        code += item?.toUI?.(state, hideDetails);
       });
       code += '}';
     }

package/src/concepts/MemberExpression__.ts

@@ -37,6 +37,9 @@ export class MemberExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'MemberExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -141,7 +144,8 @@ export class MemberExpression extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -216,7 +220,7 @@ export class MemberExpression extends LogicItem {
     return options?.finalCode === false ? `${object}['${property}']` : `(${object} || {})['${property}']`;
   }
 
-  toUI(): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     //  如果是枚举取值
     if (
       this.object?.concept === 'Identifier' &&
@@ -231,8 +235,8 @@ export class MemberExpression extends LogicItem {
     ) {
       return `Object.keys(${this.object?.toJS()}).length`;
     }
-    const object: string = this.object?.toUI();
-    const property = this.property?.toUI();
+    const object: string = this.object?.toUI(state, hideDetails);
+    const property = this.property?.toUI(state, hideDetails);
     const paramsMap: Record<string, string> = {
       pageNumber: 'page',
       pageSize: 'size',

package/src/concepts/MicroApp__.ts

@@ -19,6 +19,9 @@ export class MicroApp extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'MicroApp';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */