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

package/src/concepts/MemberExpression__.ts

@@ -34,8 +34,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__';
 
@@ -43,13 +43,12 @@ import LogicItem from './LogicItem__';
  * 成员表达式
  */
 @concept('成员表达式')
-// @ts-ignore
 export class MemberExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'MemberExpression';
+  static readonly ConceptName: string = 'MemberExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -64,7 +63,6 @@ export class MemberExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   object!: LogicItem;
 
   /**
@@ -73,7 +71,6 @@ export class MemberExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   property!: LogicItem;
 
   /**
@@ -193,7 +190,7 @@ export class MemberExpression extends LogicItem {
       return `Object.keys(${this.object?.toJS()}).length`;
     }
     if (
-      Assert.isIdentifier(this.object) &&
+      asserts.isIdentifier(this.object) &&
       this.object?.namespace?.startsWith('elements.') &&
       this.object?.namespace?.endsWith('.property')
     ) {
@@ -208,7 +205,7 @@ export class MemberExpression extends LogicItem {
       }
       let propertyName = '';
       let subProperty = '';
-      if (Assert.isIdentifier(this.property) && this.property?.namespace) {
+      if (asserts.isIdentifier(this.property) && this.property?.namespace) {
         const namespace = this.property?.namespace ?? '';
         const namespaceList = namespace?.includes('.') ? namespace?.split('.') : [namespace];
         propertyName = namespaceList[0];
@@ -216,7 +213,7 @@ export class MemberExpression extends LogicItem {
       }
       return `__${elementName}_${attrConvertCamelCase(propertyName)}${subProperty}`;
     } else if (
-      Assert.isMemberExpression(this.object) &&
+      asserts.isMemberExpression(this.object) &&
       this.object?.object?.name === 'elements' &&
       this.object?.property?.name === '$ce'
     ) {
@@ -260,9 +257,9 @@ export class MemberExpression extends LogicItem {
     if (paramsMap[this.property.name]) {
       this.property.name = paramsMap[this.property.name];
     }
-    if (Assert.isIdentifier(this.object) && property === '$ce' && object === 'elements') return;
+    if (asserts.isIdentifier(this.object) && property === '$ce' && object === 'elements') return;
     if (
-      Assert.isMemberExpression(this.object) &&
+      asserts.isMemberExpression(this.object) &&
       this.object?.object?.name === 'elements' &&
       this.object?.property?.name === '$ce'
     ) {
@@ -279,7 +276,7 @@ export class MemberExpression extends LogicItem {
       (this.object as Identifier)?.isEnum() &&
       this.property?.concept === 'Identifier'
     ) {
-      return this.isDefaultValueExpression() ? this.property?.name : `"${this.property?.name}"`;
+      return this.isDefaultValueExpression(!!state?.getVuePrototype) ? this.property?.name : `"${this.property?.name}"`;
     }
     if (
       this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') &&
@@ -288,8 +285,8 @@ export class MemberExpression extends LogicItem {
       return `Object.keys(${this.object?.toJS(state)}).length`;
     }
     if (
-      Assert.isIdentifier(this.object) &&
-      Assert.isIdentifier(this.property) &&
+      asserts.isIdentifier(this.object) &&
+      asserts.isIdentifier(this.property) &&
       this.object?.namespace?.startsWith('elements.') &&
       this.object?.namespace?.endsWith('.property')
     ) {
@@ -304,7 +301,7 @@ export class MemberExpression extends LogicItem {
       }
       let propertyName = '';
       let subProperty = '';
-      if (Assert.isIdentifier(this.property) && this.property?.namespace) {
+      if (asserts.isIdentifier(this.property) && this.property?.namespace) {
         const namespace = this.property?.namespace ?? '';
         const namespaceList = namespace?.includes('.') ? namespace?.split('.') : [namespace];
         propertyName = namespaceList[0];
@@ -312,7 +309,7 @@ export class MemberExpression extends LogicItem {
       }
       return `this['__${elementName}_${attrConvertCamelCase(propertyName)}']${subProperty}`;
     } else if (
-      Assert.isMemberExpression(this.object) &&
+      asserts.isMemberExpression(this.object) &&
       this.object?.object?.name === 'elements' &&
       this.object?.property?.name === '$ce'
     ) {
@@ -382,8 +379,8 @@ export class MemberExpression extends LogicItem {
     return (this.object as Identifier)?.isEnum?.();
   }
 
-  isDefaultValueExpression() {
-    return (this.parentNode instanceof DefaultValue)
+  isDefaultValueExpression(getVuePrototype: boolean) {
+    return this.parentNode instanceof DefaultValue && getVuePrototype;
   }
 
   // 方便快速取值,遍历获取value
@@ -485,7 +482,7 @@ export class MemberExpression extends LogicItem {
       code = newCode;
     }
     if (
-      Assert.isIdentifier(self.object) &&
+      asserts.isIdentifier(self.object) &&
       self.object?.namespace?.startsWith('elements.') &&
       self.object?.namespace?.endsWith('.property')
     ) {
@@ -493,7 +490,7 @@ export class MemberExpression extends LogicItem {
       if (self.object?.namespace?.startsWith('elements.$ce')) {
         const elementName = self.getAncestor('ViewElement')?.name;
         newCode += `__elements_completionProperty.${elementName}`;
-        if (Assert.isIdentifier(self.property) && self.property?.namespace) {
+        if (asserts.isIdentifier(self.property) && self.property?.namespace) {
           const namespace = self.property?.namespace ?? '';
           const namespaceList = namespace?.includes('.') ? namespace?.split('.') : [namespace];
           yield* wrapForEach(namespaceList, function* warpForEachGenerator(item) {
@@ -502,7 +499,7 @@ export class MemberExpression extends LogicItem {
         }
       } else {
         newCode += `__elements_completionProperty.${self.object?.name}`;
-        if (Assert.isIdentifier(self.property) && self.property?.namespace) {
+        if (asserts.isIdentifier(self.property) && self.property?.namespace) {
           const namespace = self.property?.namespace ?? '';
           const namespaceList = namespace?.includes('.') ? namespace?.split('.') : [namespace];
           yield* wrapForEach(namespaceList, function* warpForEachGenerator(item) {
@@ -513,7 +510,7 @@ export class MemberExpression extends LogicItem {
       return newCode;
     }
     if (
-      Assert.isMemberExpression(self.object) &&
+      asserts.isMemberExpression(self.object) &&
       self.object?.object?.name === 'elements' &&
       self.object?.property?.name === '$ce'
     ) {

package/src/concepts/MetadataType__.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 TypeAnnotation from './TypeAnnotation__';
@@ -34,13 +34,12 @@ import type App from './App__';
  * 元数据类型
  */
 @concept('元数据类型')
-// @ts-ignore
 export class MetadataType extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'MetadataType';
+  static readonly ConceptName: string = 'MetadataType';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -53,7 +52,6 @@ export class MetadataType extends BaseNode {
    * 名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -66,7 +64,6 @@ export class MetadataType extends BaseNode {
    * 描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -75,7 +72,6 @@ export class MetadataType extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -194,7 +190,7 @@ export class MetadataType extends BaseNode {
         this,
         'rules',
       );
-    } else if (Assert.isValidationRule(options)) {
+    } else if (asserts.isValidationRule(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       validationRule = options;
       Object.assign(validationRule, relationOptions);
@@ -315,7 +311,7 @@ export class MetadataType extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'playground' };
     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/MicroApp__.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 MicroApp extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'MicroApp';
+  static readonly ConceptName: string = 'MicroApp';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -34,49 +33,42 @@ export class MicroApp extends BaseNode {
    * 微前端框架
    */
   @property()
-  // @ts-ignore
   framework!: 'qiankun' | 'icestark';
 
   /**
    * 微应用名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 页面路径前缀
    */
   @property()
-  // @ts-ignore
   routePrefix!: string;
 
   /**
    * 接口和静态资源前缀
    */
   @property()
-  // @ts-ignore
   proxyPrefix!: string;
 
   /**
    * 登录页面地址
    */
   @property()
-  // @ts-ignore
   loginUrl!: string;
 
   /**
    * 无权限页面地址
    */
   @property()
-  // @ts-ignore
   noAuthUrl!: string;
 
   /**
    * 404页面地址
    */
   @property()
-  // @ts-ignore
   notFoundUrl!: string;
 
   /**

package/src/concepts/Module__.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 DataSource from './DataSource__';
@@ -40,13 +40,12 @@ import type App from './App__';
  * 模块
  */
 @concept('模块')
-// @ts-ignore
 export class Module extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Module';
+  static readonly ConceptName: string = 'Module';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -59,56 +58,48 @@ export class Module extends BaseNode {
    * type
    */
   @property()
-  // @ts-ignore
   type!: 'extension' | 'interface' | 'component' | 'connector' | 'customInterface';
 
   /**
    * version
    */
   @property()
-  // @ts-ignore
   version!: string;
 
   /**
    * 模块名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 模块标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 模块描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * provider
    */
   @property()
-  // @ts-ignore
   provider!: string;
 
   /**
    * 外部语言依赖
    */
   @property()
-  // @ts-ignore
   externalDependencyMap!: { maven?: Array<{ groupId: string; artifactId: string; version: string }> };
 
   /**
    * 外部语言依赖
    */
   @property()
-  // @ts-ignore
   compilerInfoMap!:
     | {
         java?: Array<{
@@ -218,7 +209,6 @@ export class Module extends BaseNode {
   @property({
     objectRef: 'Configuration',
   })
-  // @ts-ignore
   configuration!: Configuration;
 
   /**
@@ -337,7 +327,7 @@ export class Module extends BaseNode {
         this,
         'dataSources',
       );
-    } else if (Assert.isDataSource(options)) {
+    } else if (asserts.isDataSource(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       dataSource = options;
       Object.assign(dataSource, relationOptions);
@@ -491,7 +481,7 @@ export class Module extends BaseNode {
         this,
         'structures',
       );
-    } else if (Assert.isStructure(options)) {
+    } else if (asserts.isStructure(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       structure = options;
       Object.assign(structure, relationOptions);
@@ -645,7 +635,7 @@ export class Module extends BaseNode {
         this,
         'enums',
       );
-    } else if (Assert.isEnum(options)) {
+    } else if (asserts.isEnum(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       enumeration = options;
       Object.assign(enumeration, relationOptions);
@@ -799,7 +789,7 @@ export class Module extends BaseNode {
         this,
         'logics',
       );
-    } else if (Assert.isLogic(options)) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -963,7 +953,7 @@ export class Module extends BaseNode {
         this,
         'views',
       );
-    } else if (Assert.isView(options)) {
+    } else if (asserts.isView(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       view = options;
       Object.assign(view, relationOptions);
@@ -1119,7 +1109,7 @@ export class Module extends BaseNode {
         this,
         'frontendVariables',
       );
-    } else if (Assert.isVariable(options)) {
+    } else if (asserts.isVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       variable = options;
       Object.assign(variable, relationOptions);
@@ -1273,7 +1263,7 @@ export class Module extends BaseNode {
         this,
         'processes',
       );
-    } else if (Assert.isProcess(options)) {
+    } else if (asserts.isProcess(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       process = options;
       Object.assign(process, relationOptions);
@@ -1429,7 +1419,7 @@ export class Module extends BaseNode {
         this,
         'frontends',
       );
-    } else if (Assert.isFrontendLibrary(options)) {
+    } else if (asserts.isFrontendLibrary(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       frontendLibrary = options;
       Object.assign(frontendLibrary, relationOptions);
@@ -1585,7 +1575,7 @@ export class Module extends BaseNode {
         this,
         'triggerLaunchers',
       );
-    } else if (Assert.isTriggerLauncher(options)) {
+    } else if (asserts.isTriggerLauncher(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       triggerLauncher = options;
       Object.assign(triggerLauncher, relationOptions);
@@ -1741,7 +1731,7 @@ export class Module extends BaseNode {
         this,
         'connections',
       );
-    } else if (Assert.isConnection(options)) {
+    } else if (asserts.isConnection(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connection = options;
       Object.assign(connection, relationOptions);
@@ -1897,7 +1887,7 @@ export class Module extends BaseNode {
         this,
         'metadataTypes',
       );
-    } else if (Assert.isMetadataType(options)) {
+    } else if (asserts.isMetadataType(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       metadataType = options;
       Object.assign(metadataType, relationOptions);
@@ -2950,7 +2940,7 @@ export class Module extends BaseNode {
         this,
         'interfaces',
       );
-    } else if (Assert.isInterface(options)) {
+    } else if (asserts.isInterface(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       itface = options;
       Object.assign(itface, relationOptions);

package/src/concepts/MsgTriggerEvent__.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 TriggerEvent from './TriggerEvent__';
 import type Param from './Param__';
@@ -22,13 +22,12 @@ import type Process from './Process__';
  * 触发器事件消息
  */
 @concept('触发器事件消息')
-// @ts-ignore
 export class MsgTriggerEvent extends TriggerEvent {
   /** 类名 */
-  static readonly ConceptName = 'MsgTriggerEvent';
+  static readonly ConceptName: string = 'MsgTriggerEvent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['TriggerEvent', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['TriggerEvent', 'BaseNode'];
 
   /**
    * 产品概念
@@ -161,7 +160,7 @@ export class MsgTriggerEvent extends TriggerEvent {
         this,
         'properties',
       );
-    } else if (Assert.isParam(options)) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);

package/src/concepts/MsgTriggerLauncher__.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 TriggerLauncher from './TriggerLauncher__';
 import type Argument from './Argument__';
@@ -19,13 +19,12 @@ import type LogicItem from './LogicItem__';
  * 触发器启动器消息
  */
 @concept('触发器启动器消息')
-// @ts-ignore
 export class MsgTriggerLauncher extends TriggerLauncher {
   /** 类名 */
-  static readonly ConceptName = 'MsgTriggerLauncher';
+  static readonly ConceptName: string = 'MsgTriggerLauncher';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['TriggerLauncher', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['TriggerLauncher', 'BaseNode'];
 
   /**
    * 产品概念
@@ -48,7 +47,6 @@ export class MsgTriggerLauncher extends TriggerLauncher {
    * calleeConnectionName
    */
   @property()
-  // @ts-ignore
   calleeConnectionName!: string;
 
   /**
@@ -153,7 +151,7 @@ export class MsgTriggerLauncher extends TriggerLauncher {
         this,
         'properties',
       );
-    } else if (Assert.isArgument(options)) {
+    } else if (asserts.isArgument(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       argument = options;
       Object.assign(argument, relationOptions);

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