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

package/src/concepts/Connector__.ts

@@ -3,39 +3,38 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
-import Param from './Param__';
-import Logic from './Logic__';
-import ConnectorTrigger from './ConnectorTrigger__';
-import Structure from './Structure__';
-import Namespace from './Namespace__';
-import AuthLogic from './AuthLogic__';
-import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
-import TriggerLauncher from './TriggerLauncher__';
-import Connection from './Connection__';
 import Module from './Module__';
-import View from './View__';
-import ProcessElement from './ProcessElement__';
-import App from './App__';
-import Frontend from './Frontend__';
-import Process from './Process__';
+import type Param from './Param__';
+import type Logic from './Logic__';
+import type ConnectorTrigger from './ConnectorTrigger__';
+import type Structure from './Structure__';
+import type Namespace from './Namespace__';
+import type AuthLogic from './AuthLogic__';
+import type AuthLogicForCallInterface from './AuthLogicForCallInterface__';
+import type TriggerLauncher from './TriggerLauncher__';
+import type Connection from './Connection__';
+import type View from './View__';
+import type ProcessElement from './ProcessElement__';
+import type App from './App__';
+import type Frontend from './Frontend__';
+import type Process from './Process__';
 
 /**
  * 连接器
  */
-@className
 @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;
 
   /**
@@ -413,6 +406,7 @@ export class Connector extends Module {
   _insertParamAt(options: string | Partial<Param> | Param, index: number) {
     const paramOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'properties' };
+    const Param = getConceptConstructor('Param');
     let param: Param;
     if (!options) {
       param = Param.from(
@@ -432,7 +426,7 @@ export class Connector extends Module {
         this,
         'properties',
       );
-    } else if (options instanceof Param) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -566,6 +560,7 @@ export class Connector extends Module {
   _insertLogicInLogicsAt(options: string | Partial<Logic> | Logic, index: number) {
     const logicOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'logics' };
+    const Logic = getConceptConstructor('Logic');
     let logic: Logic;
     if (!options) {
       logic = Logic.from(
@@ -585,7 +580,7 @@ export class Connector extends Module {
         this,
         'logics',
       );
-    } else if (options instanceof Logic) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -721,6 +716,7 @@ export class Connector extends Module {
   _insertConnectorTriggerAt(options: string | Partial<ConnectorTrigger> | ConnectorTrigger, index: number) {
     const connectorTriggerOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'triggers' };
+    const ConnectorTrigger = getConceptConstructor('ConnectorTrigger');
     let connectorTrigger: ConnectorTrigger;
     if (!options) {
       connectorTrigger = ConnectorTrigger.from(
@@ -740,7 +736,7 @@ export class Connector extends Module {
         this,
         'triggers',
       );
-    } else if (options instanceof ConnectorTrigger) {
+    } else if (asserts.isConnectorTrigger(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connectorTrigger = options;
       Object.assign(connectorTrigger, relationOptions);
@@ -874,6 +870,7 @@ export class Connector extends Module {
   _insertStructureAt(options: string | Partial<Structure> | Structure, index: number) {
     const structureOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'structures' };
+    const Structure = getConceptConstructor('Structure');
     let structure: Structure;
     if (!options) {
       structure = Structure.from(
@@ -893,7 +890,7 @@ export class Connector extends Module {
         this,
         'structures',
       );
-    } else if (options instanceof Structure) {
+    } else if (asserts.isStructure(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       structure = options;
       Object.assign(structure, relationOptions);
@@ -1027,6 +1024,7 @@ export class Connector extends Module {
   _insertNamespaceAt(options: string | Partial<Namespace> | Namespace, index: number) {
     const namespaceOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'namespaces' };
+    const Namespace = getConceptConstructor('Namespace');
     let namespace: Namespace;
     if (!options) {
       namespace = Namespace.from(
@@ -1046,7 +1044,7 @@ export class Connector extends Module {
         this,
         'namespaces',
       );
-    } else if (options instanceof Namespace) {
+    } else if (asserts.isNamespace(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       namespace = options;
       Object.assign(namespace, relationOptions);
@@ -1182,6 +1180,7 @@ export class Connector extends Module {
   _insertTriggerLauncherAt(options: string | Partial<TriggerLauncher> | TriggerLauncher, index: number) {
     const triggerLauncherOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'triggerLaunchers' };
+    const TriggerLauncher = getConceptConstructor('TriggerLauncher');
     let triggerLauncher: TriggerLauncher;
     if (!options) {
       triggerLauncher = TriggerLauncher.from(
@@ -1201,7 +1200,7 @@ export class Connector extends Module {
         this,
         'triggerLaunchers',
       );
-    } else if (options instanceof TriggerLauncher) {
+    } else if (asserts.isTriggerLauncher(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       triggerLauncher = options;
       Object.assign(triggerLauncher, relationOptions);
@@ -1337,6 +1336,7 @@ export class Connector extends Module {
   _insertConnectionAt(options: string | Partial<Connection> | Connection, index: number) {
     const connectionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'connections' };
+    const Connection = getConceptConstructor('Connection');
     let connection: Connection;
     if (!options) {
       connection = Connection.from(
@@ -1356,7 +1356,7 @@ export class Connector extends Module {
         this,
         'connections',
       );
-    } else if (options instanceof Connection) {
+    } else if (asserts.isConnection(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connection = options;
       Object.assign(connection, relationOptions);

package/src/concepts/Constant__.ts

@@ -14,34 +14,34 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import TypeAnnotation from './TypeAnnotation__';
-import DefaultValue from './DefaultValue__';
-import Logic from './Logic__';
-import View from './View__';
-import Process from './Process__';
-import ProcessElement from './ProcessElement__';
-import Module from './Module__';
-import App from './App__';
-import Connector from './Connector__';
-import Frontend from './Frontend__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type DefaultValue from './DefaultValue__';
+import type Logic from './Logic__';
+import type View from './View__';
+import type Process from './Process__';
+import type ProcessElement from './ProcessElement__';
+import type Module from './Module__';
+import type App from './App__';
+import type Connector from './Connector__';
+import type Frontend from './Frontend__';
 
 /**
  * 常量
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -54,14 +54,12 @@ export class Constant extends BaseNode {
    * 常量名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 常量描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -70,7 +68,6 @@ export class Constant extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -79,7 +76,6 @@ export class Constant extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -312,15 +308,24 @@ export class Constant extends BaseNode {
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     let code = self.name;
+    const { typeNamespace, typeName } = self.typeAnnotation || {};
+    let typeKey = self.typeAnnotation?.typeKey;
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app?.findNodeByCompleteName(typeNamespace + '.' + typeName);
+      const { typeAnnotation } = referenceNode || {};
+      typeKey = `${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
+    }
     if (self.typeAnnotation) {
       code += ': ';
       code += yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code));
     }
     if (
       this.defaultValue?.expression &&
-      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(yield* this.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''))
+      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(
+        yield* this.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''),
+      )
     ) {
-      if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation?.typeKey)) {
+      if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
         code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
       } else {
         code += ` = `;
@@ -333,18 +338,22 @@ export class Constant extends BaseNode {
   @withSourceMapGenerator
   *toEmbeddedTSInProcess(state = createCompilerState()): TranslatorGenerator {
     let code = this.name;
+    const { typeNamespace, typeName } = this.typeAnnotation || {};
+    let typeKey = this.typeAnnotation?.typeKey;
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app?.findNodeByCompleteName(typeNamespace + '.' + typeName);
+      const { typeAnnotation } = referenceNode || {};
+      typeKey = `${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
+    }
     if (this.typeAnnotation) {
       code += `: `;
       if (
         this.defaultValue?.expression &&
-        !(
-          this.typeAnnotation &&
-          ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)
-        )
+        !(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(this.typeAnnotation?.typeKey)) {
+        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
         }
         code += 'undefined';

package/src/concepts/CountersignPolicy__.ts

@@ -0,0 +1,78 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+
+import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
+import { v4 as uuidv4 } from 'uuid';
+import MultiApprovalPolicy from './MultiApprovalPolicy__';
+
+/**
+ * 会签
+ */
+@concept('会签')
+export class CountersignPolicy extends MultiApprovalPolicy {
+  /** 类名 */
+  static readonly ConceptName: string = 'CountersignPolicy';
+
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['MultiApprovalPolicy', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'CountersignPolicy';
+
+  /**
+   * passPercent
+   */
+  @property()
+  passPercent!: number;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<CountersignPolicy>) {
+    source = Object.assign({}, CountersignPolicy.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): CountersignPolicy {
+    return super.from(source, parentNode, parentKey) as CountersignPolicy;
+  }
+
+  /**
+   * 设置passPercent
+   */
+  setPassPercent(passPercent: number) {
+    const object = {
+      passPercent,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default CountersignPolicy;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/DataSource__.ts

@@ -14,27 +14,27 @@ import datasourceService from '../service/datasource';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import Entity from './Entity__';
-import Module from './Module__';
-import App from './App__';
+import type Entity from './Entity__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 数据源
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -47,14 +47,12 @@ export class DataSource extends BaseNode {
    * 数据源名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 数据源描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -71,7 +69,6 @@ export class DataSource extends BaseNode {
    * ddl策略
    */
   @property()
-  // @ts-ignore
   ddlStrategy!: 'all' | 'originNotTable' | 'none';
 
   /**
@@ -155,6 +152,7 @@ export class DataSource extends BaseNode {
   _insertEntityAt(options: string | Partial<Entity> | Entity, index: number) {
     const entityOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'entities' };
+    const Entity = getConceptConstructor('Entity');
     let entity: Entity;
     if (!options) {
       entity = Entity.from(
@@ -174,7 +172,7 @@ export class DataSource extends BaseNode {
         this,
         'entities',
       );
-    } else if (options instanceof Entity) {
+    } else if (asserts.isEntity(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       entity = options;
       Object.assign(entity, relationOptions);

package/src/concepts/DatabaseTypeAnnotation__.ts

@@ -3,24 +3,24 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 
 /**
  * 数据库存储类型
  */
-@className
 @concept('数据库存储类型')
-// @ts-ignore
 export class DatabaseTypeAnnotation extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'DatabaseTypeAnnotation';
+  static readonly ConceptName: string = 'DatabaseTypeAnnotation';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -33,14 +33,12 @@ export class DatabaseTypeAnnotation extends BaseNode {
    * 类型名称
    */
   @property()
-  // @ts-ignore
   typeName!: string;
 
   /**
    * 类型参数
    */
   @property()
-  // @ts-ignore
   arguments!: Map<string, string>;
 
   /**

package/src/concepts/DefaultValue__.ts

@@ -5,25 +5,25 @@ import { returnOrigin } from '../utils/time-slicing';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import LogicItem from './LogicItem__';
+import type LogicItem from './LogicItem__';
 
 /**
  * 默认值
  */
-@className
 @concept('默认值')
-// @ts-ignore
 export class DefaultValue extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'DefaultValue';
+  static readonly ConceptName: string = 'DefaultValue';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -38,7 +38,6 @@ export class DefaultValue extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
@@ -107,8 +106,9 @@ export class DefaultValue extends BaseNode {
   _insertItemAt(options: Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'playground' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (options instanceof LogicItem) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -276,6 +276,16 @@ export class DefaultValue extends BaseNode {
 
   toJS(state?: TranslatorState): string {
     let code = '';
+    if (state?.getVuePrototype && this.expression?.concept === 'NullLiteral') {
+      return null;
+    }
+    if (
+      ['Date', 'Time', 'DateTime'].includes((this.parentNode as any)?.typeAnnotation?.typeName) &&
+      (this.expression as any)?.value === ''
+    ) {
+      return null;
+    }
+
     code += this.expression ? this.expression.toJS(state) : undefined;
     return code;
   }