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

package/src/concepts/ConfigProperty__.ts

@@ -1,19 +1,18 @@
-import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, withSourceMap, indent, createCompilerState } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState, indent } from '../translator';
 import ConfigGroup from './ConfigGroup__';
 import Namespace from './Namespace__';
 import View from './View__';
 
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import ConfigPropertyValue from './ConfigPropertyValue__';
 import App from './App__';
 import Module from './Module__';
@@ -21,37 +20,48 @@ import Module from './Module__';
 /**
  * 配置属性
  */
+@className
 @concept('配置属性')
+// @ts-ignore
 export class ConfigProperty extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'ConfigProperty';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'ConfigProperty' = 'ConfigProperty';
+  // @ts-ignore
+  readonly concept!: 'ConfigProperty';
 
   /**
    * 配置属性名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * 配置属性描述
    */
   @property()
-  description: string = undefined;
+  // @ts-ignore
+  description!: string;
 
   /**
    * 配置属性值列表
    */
-  @property('ConfigPropertyValue')
+  @property({
+    objectRef: 'ConfigPropertyValue',
+    isArray: true,
+  })
   values: Array<ConfigPropertyValue> = [];
 
   /**
    * isPrivate
    */
   @property()
-  isPrivate: boolean = undefined;
+  // @ts-ignore
+  isPrivate!: boolean;
 
   /**
    * 祖先 App
@@ -59,7 +69,6 @@ export class ConfigProperty extends BaseNode {
   get app() {
     return this.getAncestor('App') as App;
   }
-
   /**
    * 祖先 Module
    */
@@ -71,16 +80,11 @@ export class ConfigProperty extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<ConfigProperty>) {
-    // @ts-ignore
-    source = { ...ConfigProperty.getDefaultOptions(), ...source };
+    source = Object.assign({}, ConfigProperty.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'ConfigProperty';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): ConfigProperty {
     return super.from(source, parentNode, parentKey) as ConfigProperty;
   }
@@ -96,7 +100,6 @@ export class ConfigProperty extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置配置属性名称
    */
@@ -112,9 +115,10 @@ export class ConfigProperty extends BaseNode {
 
   getConfigPropertyValueExistingNames(excludedList: Array<ConfigPropertyValue> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.values as ConfigPropertyValue[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.values as ConfigPropertyValue[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-
   getConfigPropertyValueUniqueName(name = 'configPropertyValue1') {
     return utils.unique(name, this.getConfigPropertyValueExistingNames(), undefined, false);
   }
@@ -131,7 +135,10 @@ export class ConfigProperty extends BaseNode {
    * @internal
    * @param configPropertyValueOptions 配置属性值参数
    */
-  _insertConfigPropertyValueAt(configPropertyValueOptions: Partial<ConfigPropertyValue>, index: number): ConfigPropertyValue;
+  _insertConfigPropertyValueAt(
+    configPropertyValueOptions: Partial<ConfigPropertyValue>,
+    index: number,
+  ): ConfigPropertyValue;
 
   /**
    * 插入配置属性值
@@ -151,7 +158,7 @@ export class ConfigProperty extends BaseNode {
           name: this.getConfigPropertyValueUniqueName(),
         },
         this,
-        'values'
+        'values',
       );
     } else if (typeof options === 'string') {
       configPropertyValue = ConfigPropertyValue.from(
@@ -160,7 +167,7 @@ export class ConfigProperty extends BaseNode {
           name: options,
         },
         this,
-        'values'
+        'values',
       );
     } else if (options instanceof ConfigPropertyValue) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -173,7 +180,7 @@ export class ConfigProperty extends BaseNode {
           ...options,
         },
         this,
-        'values'
+        'values',
       );
     }
     this.values.splice(index, 0, configPropertyValue);
@@ -190,7 +197,10 @@ export class ConfigProperty extends BaseNode {
    * 插入配置属性值
    * @param configPropertyValueOptions 配置属性值参数
    */
-  insertConfigPropertyValueAt(configPropertyValueOptions: Partial<ConfigPropertyValue>, index: number): ConfigPropertyValue;
+  insertConfigPropertyValueAt(
+    configPropertyValueOptions: Partial<ConfigPropertyValue>,
+    index: number,
+  ): ConfigPropertyValue;
 
   /**
    * 插入配置属性值
@@ -281,7 +291,7 @@ export class ConfigProperty extends BaseNode {
     if (typeof options === 'string') {
       configPropertyValue = (this.values as ConfigPropertyValue[]).find((item) => item.name === options);
       if (!configPropertyValue) {
-        throw new Error(`找不到配置属性值 ${options}`);
+        throw new Error('找不到配置属性值 ' + options);
       }
     } else {
       configPropertyValue = options;
@@ -290,7 +300,7 @@ export class ConfigProperty extends BaseNode {
   }
 
   __removeConfigPropertyValue(configPropertyValue: ConfigPropertyValue) {
-    const { parentKey } = configPropertyValue;
+    const parentKey = configPropertyValue.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -312,10 +322,10 @@ export class ConfigProperty extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   /**
    * 修改属性
    */
@@ -401,15 +411,14 @@ export class ConfigProperty extends BaseNode {
     return `${this.getNamespace()}.${this.name}`;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.ConfigProperty = ConfigProperty;
 export default ConfigProperty;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/Configuration__.ts

@@ -1,33 +1,40 @@
-import { v4 as uuidv4 } from 'uuid';
 import ConfigProperty from './ConfigProperty__';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import ConfigGroup from './ConfigGroup__';
 import App from './App__';
 
 /**
  * 配置管理
  */
+@className
 @concept('配置管理')
+// @ts-ignore
 export class Configuration extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'Configuration';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'Configuration' = 'Configuration';
+  // @ts-ignore
+  readonly concept!: 'Configuration';
 
   /**
    * 配置组列表
    */
-  @property('ConfigGroup')
+  @property({
+    objectRef: 'ConfigGroup',
+    isArray: true,
+  })
   groups: Array<ConfigGroup> = [];
 
   /**
@@ -41,16 +48,11 @@ export class Configuration extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Configuration>) {
-    // @ts-ignore
-    source = { ...Configuration.getDefaultOptions(), ...source };
+    source = Object.assign({}, Configuration.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'Configuration';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): Configuration {
     return super.from(source, parentNode, parentKey) as Configuration;
   }
@@ -71,7 +73,6 @@ export class Configuration extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.groups as ConfigGroup[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
-
   getConfigGroupUniqueName(name = 'configGroup1') {
     return utils.unique(name, this.getConfigGroupExistingNames(), undefined, false);
   }
@@ -108,7 +109,7 @@ export class Configuration extends BaseNode {
           name: this.getConfigGroupUniqueName(),
         },
         this,
-        'groups'
+        'groups',
       );
     } else if (typeof options === 'string') {
       configGroup = ConfigGroup.from(
@@ -117,7 +118,7 @@ export class Configuration extends BaseNode {
           name: options,
         },
         this,
-        'groups'
+        'groups',
       );
     } else if (options instanceof ConfigGroup) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -130,7 +131,7 @@ export class Configuration extends BaseNode {
           ...options,
         },
         this,
-        'groups'
+        'groups',
       );
     }
     this.groups.splice(index, 0, configGroup);
@@ -238,7 +239,7 @@ export class Configuration extends BaseNode {
     if (typeof options === 'string') {
       configGroup = (this.groups as ConfigGroup[]).find((item) => item.name === options);
       if (!configGroup) {
-        throw new Error(`找不到配置组 ${options}`);
+        throw new Error('找不到配置组 ' + options);
       }
     } else {
       configGroup = options;
@@ -247,7 +248,7 @@ export class Configuration extends BaseNode {
   }
 
   __removeConfigGroup(configGroup: ConfigGroup) {
-    const { parentKey } = configGroup;
+    const parentKey = configGroup.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -269,10 +270,10 @@ export class Configuration extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   public static getDefaultOptions() {
     return {
@@ -303,15 +304,14 @@ export class Configuration extends BaseNode {
     throw new Error('无法获取命名空间，请设置 parentNode！');
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.Configuration = Configuration;
 export default Configuration;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/Connection__.ts

@@ -1,55 +1,65 @@
 import { getNodeByNodeCallee } from '../automate/engine/utils';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import type { Connector } from './Connector__';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState, indent } from '../translator';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import ConfigProperty from './ConfigProperty__';
 import Module from './Module__';
 import App from './App__';
-import Connector from './Connector__';
 
 /**
  * 连接
  */
+@className
 @concept('连接')
+// @ts-ignore
 export class Connection extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'Connection';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'Connection' = 'Connection';
+  // @ts-ignore
+  readonly concept!: 'Connection';
 
   /**
    * namespace
    */
   @property()
-  namespace: string = undefined;
+  // @ts-ignore
+  namespace!: string;
 
   /**
    * 连接名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * 连接标题
    */
   @property()
-  title: string = undefined;
+  // @ts-ignore
+  title!: string;
 
   /**
    * 配置属性列表
    */
-  @property('ConfigProperty')
+  @property({
+    objectRef: 'ConfigProperty',
+    isArray: true,
+  })
   properties: Array<ConfigProperty> = [];
 
   /**
@@ -73,9 +83,6 @@ export class Connection extends BaseNode {
     super(source);
     super.subConstructor(source);
   }
-  getClassName() {
-    return 'Connection';
-  }
 
   static from(source: any, parentNode?: any, parentKey?: string): Connection {
     return super.from(source, parentNode, parentKey) as Connection;
@@ -143,7 +150,9 @@ export class Connection extends BaseNode {
 
   getConfigPropertyExistingNames(excludedList: Array<ConfigProperty> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.properties as ConfigProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.properties as ConfigProperty[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
   getConfigPropertyUniqueName(name = 'configProperty1') {
     return utils.unique(name, this.getConfigPropertyExistingNames(), undefined, false);
@@ -181,7 +190,7 @@ export class Connection extends BaseNode {
           name: this.getConfigPropertyUniqueName(),
         },
         this,
-        'properties'
+        'properties',
       );
     } else if (typeof options === 'string') {
       configProperty = ConfigProperty.from(
@@ -190,7 +199,7 @@ export class Connection extends BaseNode {
           name: options,
         },
         this,
-        'properties'
+        'properties',
       );
     } else if (options instanceof ConfigProperty) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -203,7 +212,7 @@ export class Connection extends BaseNode {
           ...options,
         },
         this,
-        'properties'
+        'properties',
       );
     }
     this.properties.splice(index, 0, configProperty);
@@ -351,7 +360,7 @@ export class Connection extends BaseNode {
    * 获取connector 类型
    */
   get connector() {
-    return getNodeByNodeCallee(this.rootNode, this.namespace) as Connector;
+    return getNodeByNodeCallee(this.rootNode, this.namespace) || {} as Connector;
   }
   getConnectorType(): String {
     return this.connector?.connectorKind;
@@ -395,9 +404,9 @@ export class Connection extends BaseNode {
   @withSourceMap()
   toEmbeddedTS(state?: TranslatorState, prependCode?: string, noName?: boolean, prefix?: boolean): string {
     let code = '';
-    code += `export function ${this.name}(`;
-    code += 'cb: Function';
-    code += `) {\n`;
+    code += `export function ${this.name}<T extends (...args: any[]) => any>(`;
+    code += 'cb: T';
+    code += `): ReturnType<T> {\n`;
     code += '\n';
     code += indent((state?.tabSize || 0) + 1);
     code += 'return cb();\n';
@@ -412,7 +421,6 @@ export class Connection extends BaseNode {
   //================================================================================
 }
 
-classMap.Connection = Connection;
 export default Connection;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑