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

package/src/concepts/CallQueryComponent__.ts

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

@@ -24,6 +24,7 @@ export class Comment extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Comment';
 
@@ -90,7 +91,7 @@ export class Comment extends LogicItem {
     return `/* ${this.value} */`;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/CompletionProperty__.ts

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

package/src/concepts/ConfigGroup__.ts

@@ -26,6 +26,7 @@ export class ConfigGroup extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'ConfigGroup';
 
@@ -90,7 +91,7 @@ export class ConfigGroup extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.properties as ConfigProperty[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getConfigPropertyUniqueName(name = 'configProperty1') {
     return utils.unique(name, this.getConfigPropertyExistingNames(), undefined, false);
@@ -277,11 +278,16 @@ export class ConfigGroup extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(configProperty);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = configProperty.__v_raw || configProperty;
+      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] === configProperty) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/ConfigPropertyValue__.ts

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

package/src/concepts/ConfigProperty__.ts

@@ -30,6 +30,7 @@ export class ConfigProperty extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'ConfigProperty';
 
@@ -114,7 +115,7 @@ export class ConfigProperty extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.values as ConfigPropertyValue[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getConfigPropertyValueUniqueName(name = 'configPropertyValue1') {
     return utils.unique(name, this.getConfigPropertyValueExistingNames(), undefined, false);
@@ -307,11 +308,16 @@ export class ConfigProperty extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(configPropertyValue);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = configPropertyValue.__v_raw || configPropertyValue;
+      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] === configPropertyValue) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Configuration__.ts

@@ -25,6 +25,7 @@ export class Configuration extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Configuration';
 
@@ -68,7 +69,7 @@ export class Configuration extends BaseNode {
 
   getConfigGroupExistingNames(excludedList: Array<ConfigGroup> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.groups as ConfigGroup[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.groups as ConfigGroup[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getConfigGroupUniqueName(name = 'configGroup1') {
     return utils.unique(name, this.getConfigGroupExistingNames(), undefined, false);
@@ -255,11 +256,16 @@ export class Configuration extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(configGroup);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = configGroup.__v_raw || configGroup;
+      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] === configGroup) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Connection__.ts

@@ -29,6 +29,7 @@ export class Connection extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Connection';
 
@@ -149,7 +150,7 @@ export class Connection extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.properties as ConfigProperty[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getConfigPropertyUniqueName(name = 'configProperty1') {
     return utils.unique(name, this.getConfigPropertyExistingNames(), undefined, false);
@@ -336,11 +337,16 @@ export class Connection extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(configProperty);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = configProperty.__v_raw || configProperty;
+      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] === configProperty) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -357,7 +363,7 @@ export class Connection extends BaseNode {
    * 获取connector 类型
    */
   get connector() {
-    return getNodeByNodeCallee(this.rootNode, this.namespace) || {} as Connector;
+    return getNodeByNodeCallee(this.rootNode, this.namespace) || ({} as Connector);
   }
   getConnectorType(): String {
     return this.connector?.connectorKind;

package/src/concepts/ConnectorTrigger__.ts

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

package/src/concepts/Connector__.ts

@@ -33,6 +33,7 @@ export class Connector extends Module {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Connector';
 
@@ -293,7 +294,7 @@ export class Connector extends Module {
 
   getParamExistingNames(excludedList: Array<Param> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.properties as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.properties as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getParamUniqueName(name = 'param1') {
     return utils.unique(name, this.getParamExistingNames(), undefined, false);
@@ -446,7 +447,7 @@ export class Connector extends Module {
 
   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, false);
@@ -601,7 +602,7 @@ export class Connector extends Module {
     const excludedSet = new Set(excludedList);
     return ((this.triggers as ConnectorTrigger[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getConnectorTriggerUniqueName(name = 'connectorTrigger1') {
     return utils.unique(name, this.getConnectorTriggerExistingNames(), undefined, false);
@@ -754,7 +755,7 @@ export class Connector extends Module {
 
   getStructureExistingNames(excludedList: Array<Structure> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.structures as Structure[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.structures as Structure[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getStructureUniqueName(name = 'structure1') {
     return utils.unique(name, this.getStructureExistingNames(), undefined, false);
@@ -907,7 +908,7 @@ export class Connector extends Module {
 
   getNamespaceExistingNames(excludedList: Array<Namespace> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.namespaces as Namespace[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.namespaces as Namespace[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getNamespaceUniqueName(name = 'namespace1') {
     return utils.unique(name, this.getNamespaceExistingNames(), undefined, false);
@@ -1094,11 +1095,16 @@ export class Connector extends Module {
     };
     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;
       }
@@ -1192,11 +1198,16 @@ export class Connector extends Module {
     };
     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;
       }
@@ -1240,11 +1251,16 @@ export class Connector extends Module {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(connectorTrigger);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = connectorTrigger.__v_raw || connectorTrigger;
+      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] === connectorTrigger) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1288,11 +1304,16 @@ export class Connector extends Module {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(structure);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = structure.__v_raw || structure;
+      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] === structure) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1336,11 +1357,16 @@ export class Connector extends Module {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(namespace);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = namespace.__v_raw || namespace;
+      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] === namespace) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Constant__.ts

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

package/src/concepts/DataSource__.ts

@@ -28,6 +28,7 @@ export class DataSource extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'DataSource';
 
@@ -109,7 +110,7 @@ export class DataSource extends BaseNode {
 
   getEntityExistingNames(excludedList: Array<Entity> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.entities as Entity[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.entities as Entity[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getEntityUniqueName(name = 'Entity1') {
     return utils.unique(name, this.getEntityExistingNames(), undefined, true);
@@ -296,11 +297,16 @@ export class DataSource extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(entity);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = entity.__v_raw || entity;
+      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] === entity) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/DatabaseTypeAnnotation__.ts

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

package/src/concepts/Destination__.ts

@@ -31,6 +31,7 @@ export class Destination extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Destination';
 
@@ -284,11 +285,16 @@ export class Destination 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;
       }
@@ -747,7 +753,6 @@ export class Destination extends LogicItem {
     return code;
   }
 
-
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = '';

package/src/concepts/End__.ts

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

package/src/concepts/EntityIndex__.ts

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

package/src/concepts/EntityProperty__.ts

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

package/src/concepts/Entity__.ts

@@ -31,6 +31,7 @@ export class Entity extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Entity';
 
@@ -138,7 +139,7 @@ export class Entity extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.properties as EntityProperty[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getPropertyUniqueName(name = 'property1') {
     return utils.unique(name, this.getPropertyExistingNames(), undefined, false);
@@ -291,7 +292,7 @@ export class Entity extends BaseNode {
 
   getEntityIndexExistingNames(excludedList: Array<EntityIndex> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.indexes as EntityIndex[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.indexes as EntityIndex[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getEntityIndexUniqueName(name = 'entityIndex1') {
     return utils.unique(name, this.getEntityIndexExistingNames(), undefined, false);
@@ -478,11 +479,16 @@ export class Entity extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(property);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = property.__v_raw || property;
+      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] === property) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -526,11 +532,16 @@ export class Entity extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(entityIndex);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = entityIndex.__v_raw || entityIndex;
+      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] === entityIndex) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }