@lcap/nasl 3.3.3-beta.2 → 3.3.3-beta.4

package/src/concepts/BindDirective__.ts

@@ -312,7 +312,8 @@ export class BindDirective 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) {
@@ -532,18 +533,18 @@ export class BindDirective extends BaseNode {
     let str = '';
     // eslint-disable-next-line no-nested-ternary
     let value = this.value;
-    if(this.type === 'string') {
-        value = value.replace(/['"`\\]/g, (m) => {
-            let escape = '\\\\';
-            escape = '\\\\';
-            /// #if process.env.BUILD_TARGET === 'node'
-            escape = '\\';
-            /// #endif
-            if (m === '\\') {
-                return `${escape}${escape}`;
-            }
-            return `${escape}${m}`;
-        });
+    if (this.type === 'string') {
+      value = value.replace(/['"`\\]/g, (m) => {
+        let escape = '\\\\';
+        escape = '\\\\';
+        /// #if process.env.BUILD_TARGET === 'node'
+        escape = '\\';
+        /// #endif
+        if (m === '\\') {
+          return `${escape}${escape}`;
+        }
+        return `${escape}${m}`;
+      });
     }
     value = (this.type ?? 'string') !== 'string' ? this.value : value ? `\`${value}\`` : '';
     // 需要用标识符替换
@@ -558,7 +559,7 @@ export class BindDirective extends BaseNode {
       }
     }
     if (value !== undefined && value !== null && typeof value === 'string') {
-        value = value?.replace(/"/g, "'");
+      value = value?.replace(/"/g, "'");
     }
     if (this.name === 'auth' && !!this.value) {
       const regex = /(.\w+\[name=\w+\])/g;

package/src/concepts/BindEvent__.ts

@@ -169,7 +169,7 @@ export class BindEvent 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);
@@ -461,7 +461,8 @@ export class BindEvent 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) {
@@ -499,7 +500,8 @@ export class BindEvent 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/BindStyle__.ts

@@ -277,7 +277,8 @@ export class BindStyle 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/CallAuthInterface__.ts

@@ -55,7 +55,9 @@ export class CallAuthInterface extends CallInterface {
 
   getArgumentExistingNames(excludedList: Array<Argument> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.authArguments as Argument[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.authArguments as Argument[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item?.name);
   }
   getArgumentUniqueName(name = 'argument1') {
     return utils.unique(name, this.getArgumentExistingNames(), undefined, false);
@@ -247,7 +249,8 @@ export class CallAuthInterface extends CallInterface {
       // @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/CallFunction__.ts

@@ -1,4 +1,12 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, transfromMetadataType } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  transfromMetadataType,
+  transfromUnionTypeAnnotation,
+} from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import Identifier from './Identifier__';
@@ -317,7 +325,8 @@ export class CallFunction 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) {
@@ -355,7 +364,8 @@ export class CallFunction 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) {
@@ -395,7 +405,8 @@ export class CallFunction extends LogicItem {
       this.arguments?.forEach((arg: any, index) => {
         let argStr = arg?.toVue(options);
         const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
-        const { sortedTypeKey } = transfromMetadataType(argTypeAnnotation, this.app)
+        transfromUnionTypeAnnotation(argTypeAnnotation, this.app);
+        const { sortedTypeKey } = transfromMetadataType(argTypeAnnotation, this.app);
         if (needToString) {
           argStr = `$utils['ToString']('${sortedTypeKey}', ${argStr})`;
         } else if (['HasValue'].includes(this.calleeName)) {
@@ -473,7 +484,8 @@ export class CallFunction extends LogicItem {
       this.arguments.forEach((arg: any, index) => {
         let argStr = arg?.toJS(shiftState(state, code));
         const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
-        const { sortedTypeKey } = transfromMetadataType(argTypeAnnotation, this.app)
+        transfromUnionTypeAnnotation(argTypeAnnotation, this.app);
+        const { sortedTypeKey } = transfromMetadataType(argTypeAnnotation, this.app);
         if (needToString) {
           argStr = `this.$utils['ToString']('${sortedTypeKey}', ${argStr})`;
         } else if (['HasValue'].includes(this.calleeName)) {

package/src/concepts/CallInterface__.ts

@@ -212,7 +212,8 @@ export class CallInterface 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) {
@@ -622,25 +623,29 @@ export class CallInterface extends LogicItem {
   setCallee(_interface: Interface) {
     const calleeNamespace = _interface.getNamespace();
     const calleeName = _interface.name;
-    const params = _interface.params.map((param) => {
+    // 保留之前的参数
+    const params = _interface.params.reduce((res, param) => {
       const oldArgument = this.arguments.find((node) => node.keyword === param.name);
-      return Argument.from(
-        {
-          keyword: param.name,
-          expression: oldArgument ? oldArgument.expression : undefined,
-        },
-        this,
-        'arguments',
-      );
-    });
+      if (oldArgument && oldArgument.expression) {
+        res.push(Argument.from(
+          {
+            keyword: param.name,
+            expression: oldArgument.expression,
+          },
+          this,
+          'arguments',
+        ));
+      }
+      return res
+    }, []);
     const oldArguments = this.arguments.reduce((res, argumentNode) => {
       const targetParam = _interface.params.find((item) => item.name === argumentNode.keyword);
-      if (!targetParam) {
+      if (!targetParam && argumentNode && argumentNode.expression) {
         res.push(
           Argument.from(
             {
               keyword: argumentNode.keyword,
-              expression: argumentNode ? argumentNode.expression : undefined,
+              expression: argumentNode.expression,
             },
             this,
             'arguments',

package/src/concepts/CallLogic__.ts

@@ -1,5 +1,11 @@
 import * as JSON5 from 'json5';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  transfromUnionTypeAnnotation,
+} from '../translator';
 import Logic from './Logic__';
 import type Param from './Param__';
 import View from './View__';
@@ -376,7 +382,8 @@ export class CallLogic 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) {
@@ -414,7 +421,8 @@ export class CallLogic 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) {
@@ -466,7 +474,8 @@ export class CallLogic extends LogicItem {
       // @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) {
@@ -828,7 +837,7 @@ export class CallLogic extends LogicItem {
 
     const keywordProcessIndex = findConceptKeyWordIndexFromNamespace(calleeNamespace, 'processes');
     const isProcessLogic = keywordProcessIndex !== -1;
-    const isFrontendLibrary = calleeNamespace.startsWith('extensions') && calleeNamespace.indexOf('frontends');
+    const isFrontendLibrary = calleeNamespace?.startsWith('extensions') && calleeNamespace?.indexOf('frontends');
     // calleeNamespace不存在，一定是页面逻辑
     if (calleeNamespace) {
       const namespaceArr = calleeNamespace.split('.');
@@ -847,8 +856,9 @@ export class CallLogic extends LogicItem {
       const args = logic?.params || [];
       const keywordEntitiesIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'entities');
 
-      code += `this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
-        }']`;
+      code += `this.$logics['${
+        this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
+      }']`;
       code += `({
                 config: {
                     download: false,
@@ -1050,9 +1060,12 @@ export class CallLogic extends LogicItem {
           if (needToString) {
             const arg = this.arguments[0];
             const argTypeAnnotation = (arg as any).typeAnnotation || arg.__TypeAnnotation;
+            transfromUnionTypeAnnotation(argTypeAnnotation, this.app);
             let sortedTypeKey = argTypeAnnotation?.sortedTypeKey;
             if (argTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
-              const referenceNode = this.app.findNodeByCompleteName(argTypeAnnotation.typeNamespace + '.' + argTypeAnnotation.typeName) || {}
+              const referenceNode =
+                this.app.findNodeByCompleteName(argTypeAnnotation.typeNamespace + '.' + argTypeAnnotation.typeName) ||
+                {};
               const typeAn = referenceNode.typeAnnotation || {};
               sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
             }
@@ -1448,7 +1461,7 @@ export class CallLogic extends LogicItem {
             state: Array.isArray(t) ? 2 : 1,
           };
         });
-      } catch (err) { }
+      } catch (err) {}
     }
     return node;
   }

package/src/concepts/CallQueryComponent__.ts

@@ -712,7 +712,8 @@ export class CallQueryComponent 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) {
@@ -908,7 +909,8 @@ export class CallQueryComponent 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) {
@@ -1214,20 +1216,12 @@ export class CallQueryComponent extends LogicItem {
         if (['COUNT', 'COUNTD'].includes(item.aggregateName)) {
           typeName = 'Long';
         } else if (['AVG'].includes(item.aggregateName)) {
-          const { entityAsName, propertyName } = item.aggregateParam;
-          const entity = entities.find((item: Entity) => item.name === entityAsName);
-          const property = entity?.properties.find((item: any) => item.name === propertyName);
-          const propertyTypeName = property?.typeAnnotation?.typeName;
-          if (propertyTypeName === 'Decimal') {
-            typeName = 'Decimal';
-          } else {
-            typeName = 'Decimal';
-          }
+          typeName = 'Decimal';
         } else {
           const { entityAsName, propertyName } = item.aggregateParam;
-          const entity = entities.find((item: Entity) => item.name === entityAsName);
-          const property = entity?.properties.find((item) => item.name === propertyName);
-          typeName = property?.typeAnnotation?.typeName;
+          const entity = entities.find((e: Entity) => e.name === entityAsName);
+          const prop = entity?.properties.find((p) => p.name === propertyName);
+          typeName = prop?.typeAnnotation?.typeName;
         }
         return {
           concept: 'StructureProperty',

package/src/concepts/CompletionProperty__.ts

@@ -215,7 +215,8 @@ export class CompletionProperty 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) {

package/src/concepts/ConfigGroup__.ts

@@ -91,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);
@@ -283,7 +283,8 @@ export class ConfigGroup extends BaseNode {
       // @ts-ignore
       const n = configProperty.__v_raw || configProperty;
       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/ConfigProperty__.ts

@@ -115,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);
@@ -313,7 +313,8 @@ export class ConfigProperty extends BaseNode {
       // @ts-ignore
       const n = configPropertyValue.__v_raw || configPropertyValue;
       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/Configuration__.ts

@@ -69,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);
@@ -261,7 +261,8 @@ export class Configuration extends BaseNode {
       // @ts-ignore
       const n = configGroup.__v_raw || configGroup;
       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/Connection__.ts

@@ -150,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);
@@ -342,7 +342,8 @@ export class Connection extends BaseNode {
       // @ts-ignore
       const n = configProperty.__v_raw || configProperty;
       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/Connector__.ts

@@ -294,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);
@@ -447,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);
@@ -602,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);
@@ -755,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);
@@ -908,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);
@@ -1100,7 +1100,8 @@ export class Connector extends Module {
       // @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) {
@@ -1202,7 +1203,8 @@ export class Connector extends Module {
       // @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) {
@@ -1254,7 +1256,8 @@ export class Connector extends Module {
       // @ts-ignore
       const n = connectorTrigger.__v_raw || connectorTrigger;
       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) {
@@ -1306,7 +1309,8 @@ export class Connector extends Module {
       // @ts-ignore
       const n = structure.__v_raw || structure;
       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) {
@@ -1358,7 +1362,8 @@ export class Connector extends Module {
       // @ts-ignore
       const n = namespace.__v_raw || namespace;
       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/Constant__.ts

@@ -216,7 +216,8 @@ export class Constant 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) {

package/src/concepts/DataSource__.ts

@@ -110,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);
@@ -302,7 +302,8 @@ export class DataSource extends BaseNode {
       // @ts-ignore
       const n = entity.__v_raw || entity;
       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/Destination__.ts

@@ -290,7 +290,8 @@ export class Destination 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/EntityProperty__.ts

@@ -342,7 +342,8 @@ export class EntityProperty 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) {
@@ -394,7 +395,8 @@ export class EntityProperty extends BaseNode {
       // @ts-ignore
       const n = databaseTypeAnnotation.__v_raw || databaseTypeAnnotation;
       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) {
@@ -767,7 +769,9 @@ export class EntityProperty extends BaseNode {
     let databaseTypeInfo;
     const items = this.typeAnnotation;
     if (items?.typeNamespace?.endsWith('.metadataTypes')) {
-      const referenceNode = (this.getAncestor('App') as App).findNodeByCompleteName(items.typeNamespace + '.' + items.typeName)?.typeAnnotation || {};
+      const referenceNode =
+        (this.getAncestor('App') as App).findNodeByCompleteName(items.typeNamespace + '.' + items.typeName)
+          ?.typeAnnotation || {};
       typeKind = referenceNode.typeKind;
       typeName = referenceNode.typeName;
       typeNamespace = referenceNode.typeNamespace;

package/src/concepts/Entity__.ts

@@ -139,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);
@@ -292,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);
@@ -484,7 +484,8 @@ export class Entity extends BaseNode {
       // @ts-ignore
       const n = property.__v_raw || property;
       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) {
@@ -536,7 +537,8 @@ export class Entity extends BaseNode {
       // @ts-ignore
       const n = entityIndex.__v_raw || entityIndex;
       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) {