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

package/src/concepts/Param__.ts

@@ -47,6 +47,9 @@ export class Param extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Param';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -244,7 +247,8 @@ export class Param extends BaseNode {
       // @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) {
@@ -296,7 +300,8 @@ export class Param extends BaseNode {
       // @ts-ignore
       const n = defaultValue.__v_raw || defaultValue;
       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) {
@@ -483,6 +488,7 @@ export class Param extends BaseNode {
     // 切换类型的时候如果有默认值就清除掉
     if (this.defaultValue) {
       object.defaultValue = null;
+      this.updateRelyFileNode(this.app);
     }
     try {
       this.completionChildren = this.getSelectRef(typeAnnotation, true);

package/src/concepts/Point__.ts

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

package/src/concepts/ProcessComponent__.ts

@@ -23,6 +23,9 @@ export class ProcessComponent extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ProcessComponent';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -463,7 +466,8 @@ export class ProcessComponent extends BaseNode {
       // @ts-ignore
       const n = attribute.__v_raw || attribute;
       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) {
@@ -515,7 +519,8 @@ export class ProcessComponent extends BaseNode {
       // @ts-ignore
       const n = logic.__v_raw || logic;
       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) {

package/src/concepts/ProcessElement__.ts

@@ -41,6 +41,9 @@ export class ProcessElement extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ProcessElement';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -1267,7 +1270,8 @@ export class ProcessElement extends BaseNode {
       // @ts-ignore
       const n = bindEvent.__v_raw || bindEvent;
       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) {
@@ -1319,7 +1323,8 @@ export class ProcessElement extends BaseNode {
       // @ts-ignore
       const n = rect.__v_raw || rect;
       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) {
@@ -1371,7 +1376,8 @@ export class ProcessElement extends BaseNode {
       // @ts-ignore
       const n = point.__v_raw || point;
       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) {
@@ -1423,7 +1429,8 @@ export class ProcessElement extends BaseNode {
       // @ts-ignore
       const n = logic.__v_raw || logic;
       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) {
@@ -1475,7 +1482,8 @@ export class ProcessElement 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) {
@@ -1527,7 +1535,8 @@ export class ProcessElement 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) {
@@ -1579,7 +1588,8 @@ export class ProcessElement extends BaseNode {
       // @ts-ignore
       const n = constant.__v_raw || constant;
       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) {
@@ -1631,7 +1641,8 @@ export class ProcessElement 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) {

package/src/concepts/ProcessOutcome__.ts

@@ -1,4 +1,5 @@
-import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+import { indent, withSourceMap, createCompilerState } from '../translator';
+import { getFlowAfterElements } from '../server/getProcesses';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -22,6 +23,9 @@ export class ProcessOutcome extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'ProcessOutcome';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -73,7 +77,21 @@ export class ProcessOutcome extends LogicItem {
   //================================================================================
   @withSourceMap()
   toEmbeddedTS(state = createCompilerState()): string {
-    const code = `return () => ${this.flowRef ? `"${this.flowRef}"` : '__IDENTIFIER__'}`;
+    const tab0 = indent(state?.tabSize || 0);
+    const tab1 = indent((state?.tabSize || 0) + 1);
+    let code = '';
+
+    const afterLinkValues = getFlowAfterElements(this.processElement).map((l) => l.flowValue);
+    code += `return () => `;
+    if (this.flowRef) {
+      code += `{\n`;
+      code += `${tab1}let afterLinks: ${afterLinkValues.map((item) => `'${item}'`).join(' | ')};\n`;
+      code += `${tab1}let outCome: '${this.flowRef}';\n`;
+      code += `${tab1}nasl.core.assign(afterLinks, outCome);\n`;
+      code += `${tab0}};\n`;
+    } else {
+      code += `__IDENTIFIER__`;
+    }
     return code;
   }
 

package/src/concepts/ProcessOutcomes__.ts

@@ -1,4 +1,5 @@
-import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+import { indent, withSourceMap, createCompilerState } from '../translator';
+import { getFlowAfterElements } from '../server/getProcesses';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -21,6 +22,9 @@ export class ProcessOutcomes extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'ProcessOutcomes';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -74,7 +78,21 @@ export class ProcessOutcomes extends LogicItem {
   //================================================================================
   @withSourceMap()
   toEmbeddedTS(state = createCompilerState()): string {
-    const code = `return () => ${this.flowRefs?.length > 0 ? `"${this.flowRefs}"` : '__IDENTIFIER__'}`;
+    const tab0 = indent(state?.tabSize || 0);
+    const tab1 = indent((state?.tabSize || 0) + 1);
+    let code = '';
+
+    const afterLinkValues = getFlowAfterElements(this.processElement).map((l) => l.flowValue);
+    code += `return () => `;
+    if (this.flowRefs.length > 0) {
+      code += `{\n`;
+      code += `${tab1}let afterLinks: ${afterLinkValues.map((item) => `'${item}'`).join(' | ')};\n`;
+      code += `${tab1}let outComes: ${this.flowRefs.map((item) => `'${item}'`).join(' | ')};\n`;
+      code += `${tab1}nasl.core.assign(afterLinks, outComes);\n`;
+      code += `${tab0}};\n`;
+    } else {
+      code += `__IDENTIFIER__`;
+    }
     return code;
   }
   //================================================================================

package/src/concepts/Process__.ts

@@ -33,6 +33,9 @@ export class Process extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Process';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -993,7 +996,8 @@ export class Process extends BaseNode {
       // @ts-ignore
       const n = bindEvent.__v_raw || bindEvent;
       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) {
@@ -1045,7 +1049,8 @@ export class Process 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) {
@@ -1097,7 +1102,8 @@ export class Process 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) {
@@ -1149,7 +1155,8 @@ export class Process extends BaseNode {
       // @ts-ignore
       const n = constant.__v_raw || constant;
       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) {
@@ -1201,7 +1208,8 @@ export class Process extends BaseNode {
       // @ts-ignore
       const n = element.__v_raw || element;
       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) {
@@ -1368,7 +1376,7 @@ export class Process extends BaseNode {
     });
 
     this.returns.forEach((property) => {
-      const ts = property.defaultValue?.expression?.toEmbeddedTS();
+      const ts = property.defaultValue?.toEmbeddedTS();
       if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
         IDENTIFIERMAP.add(property);
       }
@@ -1377,7 +1385,7 @@ export class Process extends BaseNode {
       code += ';\n';
     });
     this.constants.forEach((property) => {
-      const ts = property.defaultValue?.expression?.toEmbeddedTS();
+      const ts = property.defaultValue?.toEmbeddedTS();
       if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
         IDENTIFIERMAP.add(property);
       }

package/src/concepts/QueryAggregateExpression__.ts

@@ -22,6 +22,9 @@ export class QueryAggregateExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'QueryAggregateExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -106,7 +109,8 @@ export class QueryAggregateExpression 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) {

package/src/concepts/QueryFieldExpression__.ts

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

package/src/concepts/QueryFromExpression__.ts

@@ -23,6 +23,9 @@ export class QueryFromExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'QueryFromExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -213,7 +216,8 @@ export class QueryFromExpression 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) {

package/src/concepts/QueryGroupByExpression__.ts

@@ -24,6 +24,9 @@ export class QueryGroupByExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'QueryGroupByExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -109,7 +112,8 @@ export class QueryGroupByExpression 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) {

package/src/concepts/QueryJoinExpression__.ts

@@ -23,6 +23,9 @@ export class QueryJoinExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'QueryJoinExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -428,7 +431,8 @@ export class QueryJoinExpression 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) {

package/src/concepts/QueryLimitExpression__.ts

@@ -21,6 +21,9 @@ export class QueryLimitExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'QueryLimitExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -155,7 +158,8 @@ export class QueryLimitExpression 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) {

package/src/concepts/QueryOrderByExpression__.ts

@@ -21,6 +21,9 @@ export class QueryOrderByExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'QueryOrderByExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -155,7 +158,8 @@ export class QueryOrderByExpression 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) {

package/src/concepts/QuerySelectExpression__.ts

@@ -22,6 +22,9 @@ export class QuerySelectExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'QuerySelectExpression';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -496,7 +499,8 @@ export class QuerySelectExpression 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) {

package/src/concepts/Rect__.ts

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

package/src/concepts/Return__.ts

@@ -45,6 +45,9 @@ export class Return extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Return';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -223,7 +226,8 @@ export class Return extends BaseNode {
       // @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) {
@@ -275,7 +279,8 @@ export class Return extends BaseNode {
       // @ts-ignore
       const n = defaultValue.__v_raw || defaultValue;
       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) {
@@ -337,7 +342,7 @@ export class Return extends BaseNode {
     }
     if (
       this.defaultValue?.expression &&
-      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(this.defaultValue?.expression?.toEmbeddedTS())
+      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(this.defaultValue?.toEmbeddedTS())
     ) {
       if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation?.typeKey)) {
         code += this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
@@ -433,6 +438,7 @@ export class Return extends BaseNode {
     // 切换类型的时候如果有默认值就清除掉
     if (this.defaultValue) {
       object.defaultValue = null;
+      this.updateRelyFileNode(this.app);
     }
     return this.update({
       ...object,

package/src/concepts/Role__.ts

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

package/src/concepts/SelectMembers__.ts

@@ -23,6 +23,9 @@ export class SelectMembers extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'SelectMembers';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -337,7 +340,8 @@ export class SelectMembers 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) {

package/src/concepts/Slot__.ts

@@ -23,6 +23,9 @@ export class Slot extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Slot';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -159,7 +162,8 @@ export class Slot 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) {

package/src/concepts/SqlQueryComponent__.ts

@@ -28,6 +28,9 @@ export class SqlQueryComponent extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'SqlQueryComponent';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -137,7 +140,8 @@ export class SqlQueryComponent 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) {

package/src/concepts/Start__.ts

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

package/src/concepts/StringInterpolation__.ts

@@ -23,6 +23,9 @@ export class StringInterpolation extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'StringInterpolation';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -259,7 +262,8 @@ export class StringInterpolation 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) {
@@ -297,8 +301,8 @@ export class StringInterpolation extends LogicItem {
       .join(' + ');
   }
 
-  toUI(): string {
-    return this.expressions.map((exp) => exp.toUI()).join(' + ');
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
+    return this.expressions.map((exp) => exp.toUI(state, hideDetails)).join(' + ');
   }
 
   toJS(): string {