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

package/src/concepts/EnumItem__.ts

@@ -26,6 +26,7 @@ export class EnumItem extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'EnumItem';
 

package/src/concepts/Enum__.ts

@@ -28,6 +28,7 @@ export class Enum extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Enum';
 
@@ -254,11 +255,16 @@ export class Enum extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(enumItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = enumItem.__v_raw || enumItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === enumItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Event__.ts

@@ -26,6 +26,7 @@ export class Event extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Event';
 
@@ -116,7 +117,7 @@ export class Event extends BaseNode {
 
   getParamExistingNames(excludedList: Array<Param> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.params as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.params as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getParamUniqueName(name = 'param1') {
     return utils.unique(name, this.getParamExistingNames(), undefined, false);
@@ -303,11 +304,16 @@ export class Event extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(param);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = param.__v_raw || param;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === param) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/ExternalDestination__.ts

@@ -29,6 +29,7 @@ export class ExternalDestination extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'ExternalDestination';
 
@@ -168,11 +169,16 @@ export class ExternalDestination extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/ForEachStatement__.ts

@@ -1,4 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import TypeAnnotation from './TypeAnnotation__';
 import Identifier from './Identifier__';
@@ -12,6 +11,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 import Param from './Param__';
@@ -29,6 +29,7 @@ export class ForEachStatement extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'ForEachStatement';
 
@@ -77,7 +78,7 @@ export class ForEachStatement extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<ForEachStatement>) {
-    source = { ...ForEachStatement.getDefaultOptions(), ...source};
+    source = Object.assign({}, ForEachStatement.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
@@ -278,7 +279,7 @@ export class ForEachStatement extends LogicItem {
     if (typeof options === 'string') {
       each = this.each;
       if (!each) {
-        throw new Error(`找不到逻辑项 ${  options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       each = options;
@@ -303,7 +304,7 @@ export class ForEachStatement extends LogicItem {
     if (typeof options === 'string') {
       start = this.start;
       if (!start) {
-        throw new Error(`找不到逻辑项 ${  options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       start = options;
@@ -328,7 +329,7 @@ export class ForEachStatement extends LogicItem {
     if (typeof options === 'string') {
       end = this.end;
       if (!end) {
-        throw new Error(`找不到逻辑项 ${  options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       end = options;
@@ -343,12 +344,12 @@ export class ForEachStatement extends LogicItem {
   removeItemInBody(logicItem: LogicItem): void;
 
   removeItemInBody(options: LogicItem) {
-    const logicItem: LogicItem = options;
+    let logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const {parentKey} = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -358,11 +359,16 @@ export class ForEachStatement extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -387,7 +393,7 @@ export class ForEachStatement extends LogicItem {
     if (typeof options === 'string') {
       item = this.item;
       if (!item) {
-        throw new Error(`找不到输入参数 ${  options}`);
+        throw new Error('找不到输入参数 ' + options);
       }
     } else {
       item = options;
@@ -412,7 +418,7 @@ export class ForEachStatement extends LogicItem {
     if (typeof options === 'string') {
       index = this.index;
       if (!index) {
-        throw new Error(`找不到输入参数 ${  options}`);
+        throw new Error('找不到输入参数 ' + options);
       }
     } else {
       index = options;
@@ -421,7 +427,7 @@ export class ForEachStatement extends LogicItem {
   }
 
   __removeParam(param: Param) {
-    const {parentKey} = param;
+    const parentKey = param.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -431,11 +437,16 @@ export class ForEachStatement extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(param);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = param.__v_raw || param;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === param) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -518,12 +529,11 @@ export class ForEachStatement extends LogicItem {
     code += `const ${this.item.name} = $forEachListVariable${number}[${this.index.name}];\n`;
     if (Array.isArray(this.body)) {
       this.body.forEach((logicItem) => {
-        code +=
-          `${logicItem.toJS(
-            shiftState(state, code, {
-              tabSize: 0,
-            }),
-          )  }\n`;
+        code += `${logicItem.toJS(
+          shiftState(state, code, {
+            tabSize: 0,
+          }),
+        )}\n`;
       });
     }
     code += '}\n';
@@ -553,15 +563,14 @@ export class ForEachStatement extends LogicItem {
     code += ') => {\n';
     if (Array.isArray(this.body)) {
       this.body.forEach((logicItem) => {
-        code +=
-          `${logicItem.toEmbeddedTS(
-            shiftState(state, code, {
-              tabSize: (state?.tabSize || 0) + 1,
-            }),
-          )  };\n`;
+        code += `${logicItem.toEmbeddedTS(
+          shiftState(state, code, {
+            tabSize: (state?.tabSize || 0) + 1,
+          }),
+        )};\n`;
       });
     }
-    code += `${indent(state?.tabSize || 0)  }})\n`;
+    code += `${indent(state?.tabSize || 0)}})\n`;
 
     return code;
   }
@@ -571,10 +580,10 @@ export class ForEachStatement extends LogicItem {
     let code = '';
     code += this.each
       ? this.each.toNaturalTS(
-        shiftState(state, code, {
-          tabSize: 0,
-        })
-      )
+          shiftState(state, code, {
+            tabSize: 0,
+          }),
+        )
       : '__IDENTIFIER__';
     if (['NewList', 'NewMap'].includes(this.each?.concept)) code += '\n';
     code += '.__slice(';
@@ -600,18 +609,18 @@ export class ForEachStatement extends LogicItem {
         code += `${logicItem.toNaturalTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 1,
-          })
+          }),
         )};\n`;
       });
       if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
-          code += `${indent(state.tabSize + 1)}// 当前位置\n`;
+        code += `${indent(state.tabSize + 1)}// 当前位置\n`;
     }
     code += `${indent(state?.tabSize || 0)}})\n`;
 
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/FrontendLibrary__.ts

@@ -28,6 +28,7 @@ export class FrontendLibrary extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'FrontendLibrary';
 
@@ -97,7 +98,7 @@ export class FrontendLibrary extends BaseNode {
 
   getLogicExistingNames(excludedList: Array<Logic> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, true);
@@ -252,7 +253,7 @@ export class FrontendLibrary extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.viewComponents as ViewComponent[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getViewComponentUniqueName(name = 'viewComponent1') {
     return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
@@ -439,11 +440,16 @@ export class FrontendLibrary extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logic);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logic.__v_raw || logic;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logic) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -487,11 +493,16 @@ export class FrontendLibrary extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(viewComponent);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = viewComponent.__v_raw || viewComponent;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === viewComponent) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Frontend__.ts

@@ -32,6 +32,7 @@ export class Frontend extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Frontend';
 
@@ -237,7 +238,7 @@ export class Frontend extends BaseNode {
 
   getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getBindEventUniqueName(name = 'bindEvent1') {
     return utils.unique(name, this.getBindEventExistingNames(), undefined, false);
@@ -390,7 +391,7 @@ export class Frontend extends BaseNode {
 
   getViewExistingNames(excludedList: Array<View> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.views as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.views as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getViewUniqueName(name = 'view1') {
     return utils.unique(name, this.getViewExistingNames(), undefined, true);
@@ -545,7 +546,7 @@ export class Frontend extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.variables as FrontendVariable[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getFrontendVariableUniqueName(name = 'frontendVariable1') {
     return utils.unique(name, this.getVarExistingNames(), undefined, true);
@@ -700,7 +701,7 @@ export class Frontend extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.componentDependencies as Module[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getModuleUniqueName(name = 'module1') {
     return utils.unique(name, this.getModuleExistingNames(), undefined, false);
@@ -887,11 +888,16 @@ export class Frontend extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(bindEvent);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = bindEvent.__v_raw || bindEvent;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === bindEvent) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -935,11 +941,16 @@ export class Frontend extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(view);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = view.__v_raw || view;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === view) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -983,11 +994,16 @@ export class Frontend extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(variable);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = variable.__v_raw || variable;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === variable) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1031,11 +1047,16 @@ export class Frontend extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(theme);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = theme.__v_raw || theme;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === theme) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1079,11 +1100,16 @@ export class Frontend extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(module);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = module.__v_raw || module;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === module) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Function__.ts

@@ -34,6 +34,7 @@ export class Function extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Function';
 
@@ -161,7 +162,7 @@ export class Function extends BaseNode {
 
   getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getTypeParamUniqueName(name = 'typeParam1') {
     return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);
@@ -795,11 +796,16 @@ export class Function extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeParam);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeParam.__v_raw || typeParam;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === typeParam) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -843,11 +849,16 @@ export class Function extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(param);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = param.__v_raw || param;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === param) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -891,11 +902,16 @@ export class Function extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(ret);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = ret.__v_raw || ret;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === ret) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -939,11 +955,16 @@ export class Function extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(variable);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = variable.__v_raw || variable;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === variable) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -987,11 +1008,16 @@ export class Function extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1083,8 +1109,7 @@ export class Function extends BaseNode {
       code += `(`;
       this.params.forEach((param, index) => {
         code += param.toNaturalTS(shiftState(state, code, { inline: true }));
-        if (index !== this.params.length - 1)
-          code += ', ';
+        if (index !== this.params.length - 1) code += ', ';
       });
       code += `)`;
       if (this.returns.length) {
@@ -1094,7 +1119,9 @@ export class Function extends BaseNode {
       code += ` => (`;
 
       if (this.returnExpression) {
-        code += this.returnExpression.toNaturalTS && this.returnExpression.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+        code +=
+          this.returnExpression.toNaturalTS &&
+          this.returnExpression.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
       }
       code += `${indent(state.tabSize)})`;
     } else {

package/src/concepts/Identifier__.ts

@@ -28,6 +28,7 @@ export class Identifier extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Identifier';