@lcap/nasl 3.3.2-beta.3 → 3.3.3-beta.1

package/src/concepts/Connector__.ts

@@ -33,6 +33,7 @@ export class Connector extends Module {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Connector';
 
@@ -1094,11 +1095,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +1197,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +1249,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +1301,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +1353,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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';
 
@@ -296,11 +297,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +752,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,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +389,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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;
       }
@@ -754,8 +763,15 @@ export class EntityProperty extends BaseNode {
   get databaseTypeInfo() {
     const dataSourceSqlType = (this.getAncestor('DataSource') as DataSource)?.dataSourceSqlType;
     const databaseTypeMap = this.app?.__databaseTypeMap?.[dataSourceSqlType] || {};
-    const { typeKind, typeName, typeNamespace } = this?.typeAnnotation || {};
+    let { typeKind, typeName, typeNamespace } = this?.typeAnnotation || {};
     let databaseTypeInfo;
+    const items = this.typeAnnotation;
+    if (items?.typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = (this.getAncestor('App') as App).findNodeByCompleteName(items.typeNamespace + '.' + items.typeName)?.typeAnnotation || {};
+      typeKind = referenceNode.typeKind;
+      typeName = referenceNode.typeName;
+      typeNamespace = referenceNode.typeNamespace;
+    }
     if (typeNamespace?.endsWith('.enums')) {
       databaseTypeInfo = databaseTypeMap.enum;
     } else {

package/src/concepts/Entity__.ts

@@ -31,6 +31,7 @@ export class Entity extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Entity';
 
@@ -478,11 +479,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +531,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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;
       }

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,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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';
 
@@ -303,11 +304,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +392,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 +417,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 +426,7 @@ export class ForEachStatement extends LogicItem {
   }
 
   __removeParam(param: Param) {
-    const {parentKey} = param;
+    const parentKey = param.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -431,11 +436,15 @@ 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])) {
+        const index = (t as any)[parentKey].indexOf(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 +527,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 +561,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 +578,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 +607,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 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================