@lcap/nasl 3.4.0-beta.6 → 3.5.0-alpha.1

package/src/concepts/Variable__.ts

@@ -11,11 +11,11 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
-import EntityProperty from './EntityProperty__';
-import StructureProperty from './StructureProperty__';
-import Structure from './Structure__';
+import type EntityProperty from './EntityProperty__';
+import type StructureProperty from './StructureProperty__';
+import type Structure from './Structure__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
-import Namespace from './Namespace__';
+import type Namespace from './Namespace__';
 import { Diagnostic } from '../manager/diagnostic';
 
 function tryJSONParse(str: string) {
@@ -23,7 +23,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) { }
+  } catch (e) {}
 
   return result;
 }
@@ -32,56 +32,54 @@ function tryJSONParse(str: string) {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import TypeAnnotation from './TypeAnnotation__';
-import DefaultValue from './DefaultValue__';
-import Logic from './Logic__';
-import AuthInterface from './AuthInterface__';
-import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
-import View from './View__';
-import Module from './Module__';
-import App from './App__';
-import Connector from './Connector__';
-import Frontend from './Frontend__';
-import ProcessElement from './ProcessElement__';
-import Process from './Process__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type DefaultValue from './DefaultValue__';
+import type Logic from './Logic__';
+import type AuthInterface from './AuthInterface__';
+import type AuthLogicForCallInterface from './AuthLogicForCallInterface__';
+import type View from './View__';
+import type Module from './Module__';
+import type App from './App__';
+import type Connector from './Connector__';
+import type Frontend from './Frontend__';
+import type ProcessElement from './ProcessElement__';
+import type Process from './Process__';
 
 /**
  * 变量
  */
-@className
 @concept('变量')
-// @ts-ignore
 export class Variable extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Variable';
+  static readonly ConceptName: string = 'Variable';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Variable';
+  readonly concept!: 'Variable' | 'FrontendVariable';
 
   /**
    * 变量名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 变量描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -90,7 +88,6 @@ export class Variable extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -99,7 +96,6 @@ export class Variable extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -355,8 +351,7 @@ export class Variable extends BaseNode {
     }
 
     if (this.defaultValue?.expression) {
-      const expressionJS = this.defaultValue.expression?.toJS?.() || `""`;
-      const { typeKind, typeName } = typeAnnotation || {};
+      const expressionJS = this.defaultValue?.toJS?.();
       code += expressionJS;
     } else {
       code += 'undefined';
@@ -371,15 +366,24 @@ export class Variable extends BaseNode {
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     let code = self.name;
+    const { typeNamespace, typeName } = self.typeAnnotation || {};
+    let typeKey = self.typeAnnotation?.typeKey;
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app?.findNodeByCompleteName(typeNamespace + '.' + typeName);
+      const { typeAnnotation } = referenceNode || {};
+      typeKey = `${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
+    }
     if (self.typeAnnotation) {
       code += ': ';
       code += yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code));
     }
     if (
       self.defaultValue?.expression &&
-      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(yield* self.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''))
+      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(
+        yield* self.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''),
+      )
     ) {
-      if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(self.typeAnnotation?.typeKey)) {
+      if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
         code += yield* self.defaultValue.toEmbeddedTS(shiftState(state, code), true);
       } else {
         code += ` = `;
@@ -391,7 +395,11 @@ export class Variable extends BaseNode {
     // @ts-ignore
     if (self.defaultValue && self.concept === 'FrontendVariable') {
       code += `${indent(1)}function __playground(){\n`;
-      if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(yield* self.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''))) {
+      if (
+        ['__IDENTIFIER__', '__IDENTIFIER__()'].includes(
+          yield* self.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''),
+        )
+      ) {
         code += `${indent(2)}`;
         code += yield* self.defaultValue.toEmbeddedTS(shiftState(state, code));
         code += '\n';
@@ -473,18 +481,22 @@ export class Variable extends BaseNode {
   @withSourceMapGenerator
   *toEmbeddedTSInProcess(state = createCompilerState()): TranslatorGenerator {
     let code = this.name;
+    const { typeNamespace, typeName } = this.typeAnnotation || {};
+    let typeKey = this.typeAnnotation?.typeKey;
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app?.findNodeByCompleteName(typeNamespace + '.' + typeName);
+      const { typeAnnotation } = referenceNode || {};
+      typeKey = `${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
+    }
     if (this.typeAnnotation) {
       code += `: `;
       if (
         this.defaultValue?.expression &&
-        !(
-          this.typeAnnotation &&
-          ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)
-        )
+        !(this.typeAnnotation && ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey))
       ) {
         code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
       } else {
-        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation?.typeKey)) {
+        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
         }
         code += 'undefined';
@@ -550,6 +562,7 @@ export class Variable extends BaseNode {
   get readonly() {
     return !!this.module;
   }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/ViewBlock__.ts

@@ -3,24 +3,24 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 
 /**
  * 页面代码块
  */
-@className
 @concept('页面代码块')
-// @ts-ignore
 export class ViewBlock extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ViewBlock';
+  static readonly ConceptName: string = 'ViewBlock';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -33,21 +33,18 @@ export class ViewBlock extends BaseNode {
    * 描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * 标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 代码
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**

package/src/concepts/ViewComponent__.ts

@@ -3,31 +3,31 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import Attribute from './Attribute__';
-import Event from './Event__';
-import Slot from './Slot__';
-import Logic from './Logic__';
-import ViewBlock from './ViewBlock__';
-import Module from './Module__';
-import App from './App__';
+import type Attribute from './Attribute__';
+import type Event from './Event__';
+import type Slot from './Slot__';
+import type Logic from './Logic__';
+import type ViewBlock from './ViewBlock__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 页面组件
  */
-@className
 @concept('页面组件')
-// @ts-ignore
 export class ViewComponent extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ViewComponent';
+  static readonly ConceptName: string = 'ViewComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -40,28 +40,24 @@ export class ViewComponent extends BaseNode {
    * 页面组件名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 页面组件标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 页面组件描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * category
    */
   @property()
-  // @ts-ignore
   category!: string;
 
   /**
@@ -128,7 +124,6 @@ export class ViewComponent extends BaseNode {
    * themes
    */
   @property()
-  // @ts-ignore
   themes!: Array<{ name: string; type: string }>;
 
   /**
@@ -171,7 +166,7 @@ export class ViewComponent extends BaseNode {
 
   getAttributeExistingNames(excludedList: Array<Attribute> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.attrs as Attribute[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.attrs as Attribute[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getAttributeUniqueName(name = 'attribute1') {
     return utils.unique(name, this.getAttributeExistingNames(), undefined, false);
@@ -201,6 +196,7 @@ export class ViewComponent extends BaseNode {
   _insertAttributeAt(options: string | Partial<Attribute> | Attribute, index: number) {
     const attributeOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'attrs' };
+    const Attribute = getConceptConstructor('Attribute');
     let attribute: Attribute;
     if (!options) {
       attribute = Attribute.from(
@@ -220,7 +216,7 @@ export class ViewComponent extends BaseNode {
         this,
         'attrs',
       );
-    } else if (options instanceof Attribute) {
+    } else if (asserts.isAttribute(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       attribute = options;
       Object.assign(attribute, relationOptions);
@@ -324,7 +320,7 @@ export class ViewComponent extends BaseNode {
 
   getEventExistingNames(excludedList: Array<Event> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.events as Event[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.events as Event[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getEventUniqueName(name = 'event1') {
     return utils.unique(name, this.getEventExistingNames(), undefined, false);
@@ -354,6 +350,7 @@ export class ViewComponent extends BaseNode {
   _insertEventAt(options: string | Partial<Event> | Event, index: number) {
     const eventOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'events' };
+    const Event = getConceptConstructor('Event');
     let event: Event;
     if (!options) {
       event = Event.from(
@@ -373,7 +370,7 @@ export class ViewComponent extends BaseNode {
         this,
         'events',
       );
-    } else if (options instanceof Event) {
+    } else if (asserts.isEvent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       event = options;
       Object.assign(event, relationOptions);
@@ -477,7 +474,7 @@ export class ViewComponent extends BaseNode {
 
   getSlotExistingNames(excludedList: Array<Slot> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.slots as Slot[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.slots as Slot[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getSlotUniqueName(name = 'slot1') {
     return utils.unique(name, this.getSlotExistingNames(), undefined, false);
@@ -507,6 +504,7 @@ export class ViewComponent extends BaseNode {
   _insertSlotAt(options: string | Partial<Slot> | Slot, index: number) {
     const slotOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'slots' };
+    const Slot = getConceptConstructor('Slot');
     let slot: Slot;
     if (!options) {
       slot = Slot.from(
@@ -526,7 +524,7 @@ export class ViewComponent extends BaseNode {
         this,
         'slots',
       );
-    } else if (options instanceof Slot) {
+    } else if (asserts.isSlot(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       slot = options;
       Object.assign(slot, relationOptions);
@@ -630,7 +628,7 @@ export class ViewComponent extends BaseNode {
 
   getLogicExistingNames(excludedList: Array<Logic> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.methods as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.methods as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, false);
@@ -660,6 +658,7 @@ export class ViewComponent extends BaseNode {
   _insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
     const logicOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'methods' };
+    const Logic = getConceptConstructor('Logic');
     let logic: Logic;
     if (!options) {
       logic = Logic.from(
@@ -679,7 +678,7 @@ export class ViewComponent extends BaseNode {
         this,
         'methods',
       );
-    } else if (options instanceof Logic) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -783,7 +782,9 @@ export class ViewComponent extends BaseNode {
 
   getViewComponentExistingNames(excludedList: Array<ViewComponent> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.children as ViewComponent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.children as ViewComponent[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item?.name);
   }
   getViewComponentUniqueName(name = 'viewComponent1') {
     return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
@@ -813,6 +814,7 @@ export class ViewComponent extends BaseNode {
   _insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
     const viewComponentOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'children' };
+    const ViewComponent = getConceptConstructor('ViewComponent');
     let viewComponent: ViewComponent;
     if (!options) {
       viewComponent = ViewComponent.from(
@@ -832,7 +834,7 @@ export class ViewComponent extends BaseNode {
         this,
         'children',
       );
-    } else if (options instanceof ViewComponent) {
+    } else if (asserts.isViewComponent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       viewComponent = options;
       Object.assign(viewComponent, relationOptions);
@@ -936,7 +938,7 @@ export class ViewComponent extends BaseNode {
 
   getViewBlockExistingNames(excludedList: Array<ViewBlock> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.blocks as ViewBlock[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.blocks as ViewBlock[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getViewBlockUniqueName(name = 'viewBlock1') {
     return utils.unique(name, this.getViewBlockExistingNames(), undefined, false);
@@ -966,6 +968,7 @@ export class ViewComponent extends BaseNode {
   _insertViewBlockAt(options: string | Partial<ViewBlock> | ViewBlock, index: number) {
     const viewBlockOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'blocks' };
+    const ViewBlock = getConceptConstructor('ViewBlock');
     let viewBlock: ViewBlock;
     if (!options) {
       viewBlock = ViewBlock.from(
@@ -985,7 +988,7 @@ export class ViewComponent extends BaseNode {
         this,
         'blocks',
       );
-    } else if (options instanceof ViewBlock) {
+    } else if (asserts.isViewBlock(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       viewBlock = options;
       Object.assign(viewBlock, relationOptions);
@@ -1132,9 +1135,12 @@ export class ViewComponent extends BaseNode {
         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) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -1185,9 +1191,12 @@ export class ViewComponent extends BaseNode {
         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) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -1238,9 +1247,12 @@ export class ViewComponent extends BaseNode {
         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) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -1291,9 +1303,12 @@ export class ViewComponent extends BaseNode {
         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) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -1344,9 +1359,12 @@ export class ViewComponent extends BaseNode {
         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) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -1397,9 +1415,12 @@ export class ViewComponent extends BaseNode {
         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) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;