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

package/src/concepts/CompletionProperty__.ts

@@ -7,8 +7,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__';
@@ -17,13 +17,12 @@ import type TypeAnnotation from './TypeAnnotation__';
  * 自动补全属性
  */
 @concept('自动补全属性')
-// @ts-ignore
 export class CompletionProperty extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'CompletionProperty';
+  static readonly ConceptName: string = 'CompletionProperty';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -36,28 +35,24 @@ export class CompletionProperty extends BaseNode {
    * 自动补全属性名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 自动补全属性的值
    */
   @property()
-  // @ts-ignore
   value!: string;
 
   /**
    * 自动补全属性标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 自动补全属性描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -66,21 +61,18 @@ export class CompletionProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
    * 默认值
    */
   @property()
-  // @ts-ignore
   defaultValue!: string;
 
   /**

package/src/concepts/ConfigGroup__.ts

@@ -8,8 +8,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 ConfigProperty from './ConfigProperty__';
@@ -19,13 +19,12 @@ import type App from './App__';
  * 配置组
  */
 @concept('配置组')
-// @ts-ignore
 export class ConfigGroup extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ConfigGroup';
+  static readonly ConceptName: string = 'ConfigGroup';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -38,7 +37,6 @@ export class ConfigGroup extends BaseNode {
    * 配置组名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -149,7 +147,7 @@ export class ConfigGroup extends BaseNode {
         this,
         'properties',
       );
-    } else if (Assert.isConfigProperty(options)) {
+    } else if (asserts.isConfigProperty(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       configProperty = options;
       Object.assign(configProperty, relationOptions);

package/src/concepts/ConfigPropertyValue__.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 App from './App__';
@@ -16,13 +16,12 @@ import type App from './App__';
  * 配置属性值
  */
 @concept('配置属性值')
-// @ts-ignore
 export class ConfigPropertyValue extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ConfigPropertyValue';
+  static readonly ConceptName: string = 'ConfigPropertyValue';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -35,14 +34,12 @@ export class ConfigPropertyValue extends BaseNode {
    * env
    */
   @property()
-  // @ts-ignore
   env!: string;
 
   /**
    * 配置属性值的值
    */
   @property()
-  // @ts-ignore
   value!: string;
 
   /**

package/src/concepts/ConfigProperty__.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 ConfigPropertyValue from './ConfigPropertyValue__';
@@ -33,13 +33,12 @@ import type Module from './Module__';
  * 配置属性
  */
 @concept('配置属性')
-// @ts-ignore
 export class ConfigProperty extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ConfigProperty';
+  static readonly ConceptName: string = 'ConfigProperty';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -52,14 +51,12 @@ export class ConfigProperty extends BaseNode {
    * 配置属性名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 配置属性描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -76,7 +73,6 @@ export class ConfigProperty extends BaseNode {
    * isPrivate
    */
   @property()
-  // @ts-ignore
   isPrivate!: boolean;
 
   /**
@@ -186,7 +182,7 @@ export class ConfigProperty extends BaseNode {
         this,
         'values',
       );
-    } else if (Assert.isConfigPropertyValue(options)) {
+    } else if (asserts.isConfigPropertyValue(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       configPropertyValue = options;
       Object.assign(configPropertyValue, relationOptions);

package/src/concepts/Configuration__.ts

@@ -7,8 +7,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 ConfigGroup from './ConfigGroup__';
@@ -18,13 +18,12 @@ import type App from './App__';
  * 配置管理
  */
 @concept('配置管理')
-// @ts-ignore
 export class Configuration extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Configuration';
+  static readonly ConceptName: string = 'Configuration';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -127,7 +126,7 @@ export class Configuration extends BaseNode {
         this,
         'groups',
       );
-    } else if (Assert.isConfigGroup(options)) {
+    } else if (asserts.isConfigGroup(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       configGroup = options;
       Object.assign(configGroup, relationOptions);

package/src/concepts/Connection__.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 BaseNode from '../common/BaseNode';
 import type ConfigProperty from './ConfigProperty__';
@@ -32,13 +32,12 @@ import type App from './App__';
  * 连接
  */
 @concept('连接')
-// @ts-ignore
 export class Connection extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Connection';
+  static readonly ConceptName: string = 'Connection';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -51,21 +50,18 @@ export class Connection extends BaseNode {
    * namespace
    */
   @property()
-  // @ts-ignore
   namespace!: string;
 
   /**
    * 连接名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 连接标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
@@ -218,7 +214,7 @@ export class Connection extends BaseNode {
         this,
         'properties',
       );
-    } else if (Assert.isConfigProperty(options)) {
+    } else if (asserts.isConfigProperty(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       configProperty = options;
       Object.assign(configProperty, relationOptions);

package/src/concepts/ConnectorTrigger__.ts

@@ -8,8 +8,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 Module from './Module__';
@@ -23,13 +23,12 @@ import type Process from './Process__';
  * 连接器触发器
  */
 @concept('连接器触发器')
-// @ts-ignore
 export class ConnectorTrigger extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ConnectorTrigger';
+  static readonly ConceptName: string = 'ConnectorTrigger';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -42,21 +41,18 @@ export class ConnectorTrigger extends BaseNode {
    * 连接器触发器名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * triggerType
    */
   @property()
-  // @ts-ignore
   triggerType!: string;
 
   /**
    * triggerEvent
    */
   @property()
-  // @ts-ignore
   triggerEvent!: TriggerEvent;
 
   /**

package/src/concepts/Connector__.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 Module from './Module__';
 import type Param from './Param__';
@@ -29,13 +29,12 @@ import type Process from './Process__';
  * 连接器
  */
 @concept('连接器')
-// @ts-ignore
 export class Connector extends Module {
   /** 类名 */
-  static readonly ConceptName = 'Connector';
+  static readonly ConceptName: string = 'Connector';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['Module', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Module', 'BaseNode'];
 
   /**
    * 产品概念
@@ -48,14 +47,12 @@ export class Connector extends Module {
    * 连接器名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * connectorKind
    */
   @property()
-  // @ts-ignore
   connectorKind!: string;
 
   /**
@@ -102,7 +99,6 @@ export class Connector extends Module {
    * compilerInfoMap
    */
   @property()
-  // @ts-ignore
   compilerInfoMap!: Map<string, string>;
 
   /**
@@ -111,7 +107,6 @@ export class Connector extends Module {
   @property({
     objectRef: 'Logic',
   })
-  // @ts-ignore
   createLogic!: undefined;
 
   /**
@@ -120,14 +115,12 @@ export class Connector extends Module {
   @property({
     objectRef: 'Logic',
   })
-  // @ts-ignore
   testConnectorLogic!: undefined;
 
   /**
    * 预览图
    */
   @property()
-  // @ts-ignore
   previewImg!: string;
 
   /**
@@ -433,7 +426,7 @@ export class Connector extends Module {
         this,
         'properties',
       );
-    } else if (Assert.isParam(options)) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -587,7 +580,7 @@ export class Connector extends Module {
         this,
         'logics',
       );
-    } else if (Assert.isLogic(options)) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -743,7 +736,7 @@ export class Connector extends Module {
         this,
         'triggers',
       );
-    } else if (Assert.isConnectorTrigger(options)) {
+    } else if (asserts.isConnectorTrigger(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connectorTrigger = options;
       Object.assign(connectorTrigger, relationOptions);
@@ -897,7 +890,7 @@ export class Connector extends Module {
         this,
         'structures',
       );
-    } else if (Assert.isStructure(options)) {
+    } else if (asserts.isStructure(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       structure = options;
       Object.assign(structure, relationOptions);
@@ -1051,7 +1044,7 @@ export class Connector extends Module {
         this,
         'namespaces',
       );
-    } else if (Assert.isNamespace(options)) {
+    } else if (asserts.isNamespace(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       namespace = options;
       Object.assign(namespace, relationOptions);
@@ -1207,7 +1200,7 @@ export class Connector extends Module {
         this,
         'triggerLaunchers',
       );
-    } else if (Assert.isTriggerLauncher(options)) {
+    } else if (asserts.isTriggerLauncher(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       triggerLauncher = options;
       Object.assign(triggerLauncher, relationOptions);
@@ -1363,7 +1356,7 @@ export class Connector extends Module {
         this,
         'connections',
       );
-    } else if (Assert.isConnection(options)) {
+    } else if (asserts.isConnection(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connection = options;
       Object.assign(connection, relationOptions);

package/src/concepts/Constant__.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 TypeAnnotation from './TypeAnnotation__';
@@ -36,13 +36,12 @@ import type Frontend from './Frontend__';
  * 常量
  */
 @concept('常量')
-// @ts-ignore
 export class Constant extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Constant';
+  static readonly ConceptName: string = 'Constant';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -55,14 +54,12 @@ export class Constant extends BaseNode {
    * 常量名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 常量描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -71,7 +68,6 @@ export class Constant extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -80,7 +76,6 @@ export class Constant extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -352,15 +347,13 @@ export class Constant extends BaseNode {
     }
     if (this.typeAnnotation) {
       code += `: `;
-      if (
-        this.defaultValue?.expression &&
-        !(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(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/CountersignPolicy__.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 CountersignPolicy extends MultiApprovalPolicy {
   /** 类名 */
-  static readonly ConceptName = 'CountersignPolicy';
+  static readonly ConceptName: string = 'CountersignPolicy';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['MultiApprovalPolicy', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['MultiApprovalPolicy', 'BaseNode'];
 
   /**
    * 产品概念
@@ -34,7 +33,6 @@ export class CountersignPolicy extends MultiApprovalPolicy {
    * passPercent
    */
   @property()
-  // @ts-ignore
   passPercent!: number;
 
   /**

package/src/concepts/DataSource__.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 Entity from './Entity__';
@@ -29,13 +29,12 @@ import type App from './App__';
  * 数据源
  */
 @concept('数据源')
-// @ts-ignore
 export class DataSource extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'DataSource';
+  static readonly ConceptName: string = 'DataSource';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -48,14 +47,12 @@ export class DataSource extends BaseNode {
    * 数据源名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 数据源描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -72,7 +69,6 @@ export class DataSource extends BaseNode {
    * ddl策略
    */
   @property()
-  // @ts-ignore
   ddlStrategy!: 'all' | 'originNotTable' | 'none';
 
   /**
@@ -176,7 +172,7 @@ export class DataSource extends BaseNode {
         this,
         'entities',
       );
-    } else if (Assert.isEntity(options)) {
+    } else if (asserts.isEntity(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       entity = options;
       Object.assign(entity, relationOptions);