@lcap/nasl 3.5.0-beta.1 → 3.5.0-beta.3

package/src/concepts/QuerySelectExpression__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 import type QueryAggregateExpression from './QueryAggregateExpression__';
@@ -17,13 +17,12 @@ import type QueryFieldExpression from './QueryFieldExpression__';
  * 查询选择子句
  */
 @concept('查询选择子句')
-// @ts-ignore
 export class QuerySelectExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QuerySelectExpression';
+  static readonly ConceptName: string = 'QuerySelectExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -142,7 +141,7 @@ export class QuerySelectExpression extends LogicItem {
         this,
         'selectElements',
       );
-    } else if (Assert.isQueryAggregateExpression(options)) {
+    } else if (asserts.isQueryAggregateExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryAggregateExpression = options;
       Object.assign(queryAggregateExpression, relationOptions);
@@ -318,7 +317,7 @@ export class QuerySelectExpression extends LogicItem {
         this,
         'selectElements',
       );
-    } else if (Assert.isQueryFieldExpression(options)) {
+    } else if (asserts.isQueryFieldExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryFieldExpression = options;
       Object.assign(queryFieldExpression, relationOptions);

package/src/concepts/Rect__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 
@@ -15,13 +15,12 @@ import BaseNode from '../common/BaseNode';
  * 矩形信息
  */
 @concept('矩形信息')
-// @ts-ignore
 export class Rect extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Rect';
+  static readonly ConceptName: string = 'Rect';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -34,28 +33,24 @@ export class Rect extends BaseNode {
    * x
    */
   @property()
-  // @ts-ignore
   x!: number;
 
   /**
    * y
    */
   @property()
-  // @ts-ignore
   y!: number;
 
   /**
    * width
    */
   @property()
-  // @ts-ignore
   width!: number;
 
   /**
    * height
    */
   @property()
-  // @ts-ignore
   height!: number;
 
   /**

package/src/concepts/Return__.ts

@@ -30,8 +30,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type TypeAnnotation from './TypeAnnotation__';
@@ -49,13 +49,12 @@ import type Process from './Process__';
  * 输出参数
  */
 @concept('输出参数')
-// @ts-ignore
 export class Return extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Return';
+  static readonly ConceptName: string = 'Return';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -68,14 +67,12 @@ export class Return extends BaseNode {
    * 输出参数名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 输出参数描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -84,7 +81,6 @@ export class Return extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -93,7 +89,6 @@ export class Return extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -327,12 +322,20 @@ export class Return extends BaseNode {
   toJS(state?: TranslatorState): string {
     const context = this.view ? 'this' : 'Vue.prototype';
     const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
     const needGenInitFromSchema =
       typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     let code = `${this.name} = `;
     if (needGenInitFromSchema) {
-      code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
     }
 
     if (this.defaultValue?.expression) {
@@ -406,18 +409,13 @@ export class Return extends BaseNode {
     let code = this.name;
     if (this.typeAnnotation) {
       code += `: `;
-      if (
-        this.defaultValue?.expression &&
-        !(
-          this.typeAnnotation &&
-          ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.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 (this.defaultValue?.expression) {
+        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
+        } else {
+          code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
         }
+      } else {
         code += 'undefined';
       }
       code += ' as ';

package/src/concepts/Role__.ts

@@ -17,8 +17,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type App from './App__';
@@ -27,13 +27,12 @@ import type App from './App__';
  * 角色
  */
 @concept('角色')
-// @ts-ignore
 export class Role extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Role';
+  static readonly ConceptName: string = 'Role';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -46,7 +45,6 @@ export class Role extends BaseNode {
    * 角色名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -59,14 +57,12 @@ export class Role extends BaseNode {
    * 创建时间
    */
   @property()
-  // @ts-ignore
   createdTime!: string;
 
   /**
    * 角色描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**

package/src/concepts/SelectMembers__.ts

@@ -18,8 +18,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type LogicItem from './LogicItem__';
@@ -28,13 +28,12 @@ import type LogicItem from './LogicItem__';
  * 选择成员
  */
 @concept('选择成员')
-// @ts-ignore
 export class SelectMembers extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'SelectMembers';
+  static readonly ConceptName: string = 'SelectMembers';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -55,7 +54,6 @@ export class SelectMembers extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
@@ -183,7 +181,7 @@ export class SelectMembers extends BaseNode {
         this,
         'members',
       );
-    } else if (Assert.isLogicItem(options)) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);

package/src/concepts/SequentialPolicy__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import MultiApprovalPolicy from './MultiApprovalPolicy__';
 
@@ -15,13 +15,12 @@ import MultiApprovalPolicy from './MultiApprovalPolicy__';
  * 依次审批
  */
 @concept('依次审批')
-// @ts-ignore
 export class SequentialPolicy extends MultiApprovalPolicy {
   /** 类名 */
-  static readonly ConceptName = 'SequentialPolicy';
+  static readonly ConceptName: string = 'SequentialPolicy';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['MultiApprovalPolicy', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['MultiApprovalPolicy', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/Slot__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type Param from './Param__';
@@ -19,13 +19,12 @@ import type App from './App__';
  * 插槽
  */
 @concept('插槽')
-// @ts-ignore
 export class Slot extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Slot';
+  static readonly ConceptName: string = 'Slot';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -38,35 +37,30 @@ export class Slot extends BaseNode {
    * 插槽名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 插槽标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 插槽描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * emptyBackground
    */
   @property()
-  // @ts-ignore
   emptyBackground!: 'drag-entity-here';
 
   /**
    * 是否为高级功能，不在低代码中显示
    */
   @property()
-  // @ts-ignore
   advanced!: boolean;
 
   /**
@@ -75,7 +69,6 @@ export class Slot extends BaseNode {
   @property({
     objectRef: 'Param',
   })
-  // @ts-ignore
   slotProps!: Param;
 
   /**

package/src/concepts/SqlQueryComponent__.ts

@@ -21,8 +21,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 import type TypeAnnotation from './TypeAnnotation__';
@@ -31,13 +31,12 @@ import type TypeAnnotation from './TypeAnnotation__';
  * SQL 查询
  */
 @concept('SQL 查询')
-// @ts-ignore
 export class SqlQueryComponent extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'SqlQueryComponent';
+  static readonly ConceptName: string = 'SqlQueryComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -56,7 +55,6 @@ export class SqlQueryComponent extends LogicItem {
    * SQL 查询
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**
@@ -65,21 +63,18 @@ export class SqlQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 数据源
    */
   @property()
-  // @ts-ignore
   dataSource!: string;
 
   /**
    * 查询组件的局部版本
    */
   @property()
-  // @ts-ignore
   ideVersion!: string;
 
   /**

package/src/concepts/Start__.ts

@@ -15,8 +15,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 
@@ -24,13 +24,12 @@ import LogicItem from './LogicItem__';
  * 开始节点
  */
 @concept('开始节点')
-// @ts-ignore
 export class Start extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Start';
+  static readonly ConceptName: string = 'Start';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/StaticString__.ts

@@ -9,8 +9,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 
@@ -18,13 +18,12 @@ import BaseNode from '../common/BaseNode';
  * 静态字符串
  */
 @concept('静态字符串')
-// @ts-ignore
 export class StaticString extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'StaticString';
+  static readonly ConceptName: string = 'StaticString';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -43,7 +42,6 @@ export class StaticString extends BaseNode {
    * i18nKey
    */
   @property()
-  // @ts-ignore
   i18nKey!: string;
 
   /**

package/src/concepts/StringInterpolation__.ts

@@ -20,8 +20,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 
@@ -29,13 +29,12 @@ import LogicItem from './LogicItem__';
  * 字符串插值
  */
 @concept('字符串插值')
-// @ts-ignore
 export class StringInterpolation extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'StringInterpolation';
+  static readonly ConceptName: string = 'StringInterpolation';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -131,7 +130,7 @@ export class StringInterpolation extends LogicItem {
         this,
         'expressions',
       );
-    } else if (Assert.isLogicItem(options)) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);

package/src/concepts/StringLiteral__.ts

@@ -16,8 +16,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 
@@ -25,13 +25,12 @@ import LogicItem from './LogicItem__';
  * 字符串字面量
  */
 @concept('字符串字面量')
-// @ts-ignore
 export class StringLiteral extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'StringLiteral';
+  static readonly ConceptName: string = 'StringLiteral';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -50,7 +49,6 @@ export class StringLiteral extends LogicItem {
    * i18nKey
    */
   @property()
-  // @ts-ignore
   i18nKey!: string;
 
   /**

package/src/concepts/StructureProperty__.ts

@@ -21,8 +21,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type TypeAnnotation from './TypeAnnotation__';
@@ -35,13 +35,12 @@ import type App from './App__';
  * 数据结构属性
  */
 @concept('数据结构属性')
-// @ts-ignore
 export class StructureProperty extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'StructureProperty';
+  static readonly ConceptName: string = 'StructureProperty';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -54,21 +53,18 @@ export class StructureProperty extends BaseNode {
    * 数据结构属性名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 数据结构属性标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 数据结构属性描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -77,14 +73,12 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
@@ -93,14 +87,12 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
    * 数据结构字段 JSON 的序列化别名
    */
   @property()
-  // @ts-ignore
   jsonName!: string;
 
   /**