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

package/src/concepts/Structure__.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 TypeParam from './TypeParam__';
@@ -34,13 +34,12 @@ import type App from './App__';
  * 数据结构
  */
 @concept('数据结构')
-// @ts-ignore
 export class Structure extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Structure';
+  static readonly ConceptName: string = 'Structure';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -53,21 +52,18 @@ export class Structure extends BaseNode {
    * 数据结构名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 数据结构描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * 数据结构来源
    */
   @property()
-  // @ts-ignore
   origin!: 'CallQueryComponent';
 
   /**
@@ -204,7 +200,7 @@ export class Structure extends BaseNode {
         this,
         'typeParams',
       );
-    } else if (Assert.isTypeParam(options)) {
+    } else if (asserts.isTypeParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeParam = options;
       Object.assign(typeParam, relationOptions);
@@ -360,7 +356,7 @@ export class Structure extends BaseNode {
         this,
         'properties',
       );
-    } else if (Assert.isStructureProperty(options)) {
+    } else if (asserts.isStructureProperty(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       property = options;
       Object.assign(property, relationOptions);

package/src/concepts/SwitchCase__.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 LogicItem from './LogicItem__';
 
@@ -26,13 +26,12 @@ import LogicItem from './LogicItem__';
  * 选择分支情况
  */
 @concept('选择分支情况')
-// @ts-ignore
 export class SwitchCase extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'SwitchCase';
+  static readonly ConceptName: string = 'SwitchCase';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,7 +46,6 @@ export class SwitchCase extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   test!: LogicItem;
 
   /**
@@ -107,7 +105,7 @@ export class SwitchCase extends LogicItem {
     const relationOptions = { parentNode: this, parentKey: 'consequent' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);

package/src/concepts/SwitchStatement__.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 LogicItem from './LogicItem__';
 import type SwitchCase from './SwitchCase__';
@@ -27,13 +27,12 @@ import type SwitchCase from './SwitchCase__';
  * 选择分支
  */
 @concept('选择分支')
-// @ts-ignore
 export class SwitchStatement extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'SwitchStatement';
+  static readonly ConceptName: string = 'SwitchStatement';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -84,7 +83,7 @@ export class SwitchStatement extends LogicItem {
     const relationOptions = { parentNode: this, parentKey: 'cases' };
     const SwitchCase = getConceptConstructor('SwitchCase');
     let switchCase: SwitchCase;
-    if (Assert.isSwitchCase(options)) {
+    if (asserts.isSwitchCase(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       switchCase = options;
       Object.assign(switchCase, relationOptions);

package/src/concepts/Theme__.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 Theme extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Theme';
+  static readonly ConceptName: string = 'Theme';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/Transactional__.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 Logic from './Logic__';
@@ -23,13 +23,12 @@ import type Process from './Process__';
  * 事务
  */
 @concept('事务')
-// @ts-ignore
 export class Transactional extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Transactional';
+  static readonly ConceptName: string = 'Transactional';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -42,21 +41,18 @@ export class Transactional extends BaseNode {
    * 事务是否生效
    */
   @property()
-  // @ts-ignore
   enabled!: boolean;
 
   /**
    * 事务的传播机制
    */
   @property()
-  // @ts-ignore
   propagation!: 'REQUIRED' | 'REQUIRES_NEW' | 'SUPPORTS' | 'NOT_SUPPORTED' | 'MANDATORY' | 'NEVER';
 
   /**
    * 事务的隔离级别
    */
   @property()
-  // @ts-ignore
   isolation!: 'DEFAULT' | 'READ_UNCOMMITTED' | 'READ_COMMITTED' | 'REPEATABLE_READ' | 'SERIALIZABLE';
 
   /**

package/src/concepts/TriggerEvent__.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 TypeAnnotation from './TypeAnnotation__';
@@ -16,13 +16,12 @@ import type TypeAnnotation from './TypeAnnotation__';
  * 触发器事件
  */
 @concept('触发器事件')
-// @ts-ignore
 export class TriggerEvent extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'TriggerEvent';
+  static readonly ConceptName: string = 'TriggerEvent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -35,7 +34,6 @@ export class TriggerEvent extends BaseNode {
    * 触发器事件名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -44,7 +42,6 @@ export class TriggerEvent extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   callBackLogic!: TypeAnnotation;
 
   /**

package/src/concepts/TriggerLauncher__.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 Module from './Module__';
@@ -31,13 +31,12 @@ import type App from './App__';
  * 触发器启动器
  */
 @concept('触发器启动器')
-// @ts-ignore
 export class TriggerLauncher extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'TriggerLauncher';
+  static readonly ConceptName: string = 'TriggerLauncher';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -50,28 +49,24 @@ export class TriggerLauncher extends BaseNode {
    * 触发器启动器名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * calleeNamespace
    */
   @property()
-  // @ts-ignore
   calleeNamespace!: string;
 
   /**
    * calleeName
    */
   @property()
-  // @ts-ignore
   calleeName!: string;
 
   /**
    * callBackLogic
    */
   @property()
-  // @ts-ignore
   callBackLogic!: Identifier;
 
   /**

package/src/concepts/TypeAnnotation__.ts

@@ -105,8 +105,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 StructureProperty from './StructureProperty__';
@@ -115,13 +115,12 @@ import type StructureProperty from './StructureProperty__';
  * 类型标注
  */
 @concept('类型标注')
-// @ts-ignore
 export class TypeAnnotation extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'TypeAnnotation';
+  static readonly ConceptName: string = 'TypeAnnotation';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -134,21 +133,18 @@ export class TypeAnnotation extends BaseNode {
    * 类型种类
    */
   @property()
-  // @ts-ignore
   typeKind!: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure';
 
   /**
    * 类型命名空间
    */
   @property()
-  // @ts-ignore
   typeNamespace!: string;
 
   /**
    * 类型名称
    */
   @property()
-  // @ts-ignore
   typeName!: string;
 
   /**
@@ -175,7 +171,6 @@ export class TypeAnnotation extends BaseNode {
    * 是否是推断出来的
    */
   @property()
-  // @ts-ignore
   inferred!: boolean;
 
   /**
@@ -192,7 +187,6 @@ export class TypeAnnotation extends BaseNode {
    * 规则对象
    */
   @property()
-  // @ts-ignore
   ruleMap!: Object;
 
   /**
@@ -250,7 +244,7 @@ export class TypeAnnotation extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
     const TypeAnnotation = getConceptConstructor('TypeAnnotation');
     let typeAnnotation: TypeAnnotation;
-    if (Assert.isTypeAnnotation(options)) {
+    if (asserts.isTypeAnnotation(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeAnnotation = options;
       Object.assign(typeAnnotation, relationOptions);
@@ -351,7 +345,7 @@ export class TypeAnnotation extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'returnType' };
     const TypeAnnotation = getConceptConstructor('TypeAnnotation');
     let typeAnnotation: TypeAnnotation;
-    if (Assert.isTypeAnnotation(options)) {
+    if (asserts.isTypeAnnotation(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeAnnotation = options;
       Object.assign(typeAnnotation, relationOptions);
@@ -452,7 +446,7 @@ export class TypeAnnotation extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'properties' };
     const StructureProperty = getConceptConstructor('StructureProperty');
     let structureProperty: StructureProperty;
-    if (Assert.isStructureProperty(options)) {
+    if (asserts.isStructureProperty(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       structureProperty = options;
       Object.assign(structureProperty, relationOptions);
@@ -1207,7 +1201,7 @@ export class TypeAnnotation extends BaseNode {
   }
   // 增加插入泛型子类型
   typeArgumentsPush(typeItem: TypeAnnotation) {
-    if (Assert.isTypeAnnotation(typeItem)) {
+    if (asserts.isTypeAnnotation(typeItem)) {
       this.typeArguments.push(
         TypeAnnotation.from(typeItem, {
           parentNode: this,
@@ -1253,7 +1247,7 @@ export class TypeAnnotation extends BaseNode {
         return undefined; // 忽略此属性
       }
       return value; // 其他情况下返回原始值
-    }
+    };
     if (typeAnnotation1.typeArguments) {
       typeAnnotation1.typeArguments = this.sortedTypeKey;
     }

package/src/concepts/TypeParam__.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 BaseNode from '../common/BaseNode';
 
@@ -25,13 +25,12 @@ import BaseNode from '../common/BaseNode';
  * 类型参数
  */
 @concept('类型参数')
-// @ts-ignore
 export class TypeParam extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'TypeParam';
+  static readonly ConceptName: string = 'TypeParam';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -44,7 +43,6 @@ export class TypeParam extends BaseNode {
    * 类型名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**

package/src/concepts/UnaryExpression__.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 LogicItem from './LogicItem__';
 
@@ -27,13 +27,12 @@ import LogicItem from './LogicItem__';
  * 一元表达式
  */
 @concept('一元表达式')
-// @ts-ignore
 export class UnaryExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'UnaryExpression';
+  static readonly ConceptName: string = 'UnaryExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -48,14 +47,12 @@ export class UnaryExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   argument!: LogicItem;
 
   /**
    * 运算符
    */
   @property()
-  // @ts-ignore
   operator!: '!' | 'isNull';
 
   /**

package/src/concepts/Unparsed__.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 Unparsed extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Unparsed';
+  static readonly ConceptName: string = 'Unparsed';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -44,7 +43,6 @@ export class Unparsed extends LogicItem {
    * 表达式代码
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**

package/src/concepts/UseComponent__.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';
  * IDE 中使用的编辑组件
  */
 @concept('IDE 中使用的编辑组件')
-// @ts-ignore
 export class UseComponent extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'UseComponent';
+  static readonly ConceptName: string = 'UseComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -34,14 +33,12 @@ export class UseComponent extends BaseNode {
    * type
    */
   @property()
-  // @ts-ignore
   type!: string;
 
   /**
    * 需要传入的属性
    */
   @property()
-  // @ts-ignore
   attrs!: Object;
 
   /**

package/src/concepts/ValidationRule__.ts

@@ -23,8 +23,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 Argument from './Argument__';
@@ -33,13 +33,12 @@ import type Argument from './Argument__';
  * 验证规则
  */
 @concept('验证规则')
-// @ts-ignore
 export class ValidationRule extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'ValidationRule';
+  static readonly ConceptName: string = 'ValidationRule';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -58,14 +57,12 @@ export class ValidationRule extends LogicItem {
    * calleeNamespace
    */
   @property()
-  // @ts-ignore
   calleeNamespace!: string;
 
   /**
    * calleeName
    */
   @property()
-  // @ts-ignore
   calleeName!: string;
 
   /**
@@ -84,7 +81,6 @@ export class ValidationRule extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   errorMessage!: LogicItem;
 
   /**
@@ -93,7 +89,6 @@ export class ValidationRule extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   target!: LogicItem;
 
   /**
@@ -176,7 +171,7 @@ export class ValidationRule extends LogicItem {
     const relationOptions = { parentNode: this, parentKey: 'arguments' };
     const Argument = getConceptConstructor('Argument');
     let argument: Argument;
-    if (Assert.isArgument(options)) {
+    if (asserts.isArgument(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       argument = options;
       Object.assign(argument, relationOptions);