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

package/src/concepts/Integration__.ts

@@ -3,28 +3,28 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 MicroApp from './MicroApp__';
-import Connector from './Connector__';
-import App from './App__';
-import Module from './Module__';
+import type MicroApp from './MicroApp__';
+import type Connector from './Connector__';
+import type App from './App__';
+import type Module from './Module__';
 
 /**
  * 集成
  */
-@className
 @concept('集成')
-// @ts-ignore
 export class Integration extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Integration';
+  static readonly ConceptName: string = 'Integration';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -39,7 +39,6 @@ export class Integration extends BaseNode {
   @property({
     objectRef: 'MicroApp',
   })
-  // @ts-ignore
   microApp!: MicroApp;
 
   /**
@@ -142,6 +141,7 @@ export class Integration extends BaseNode {
   _insertConnectorAt(options: string | Partial<Connector> | Connector, index: number) {
     const connectorOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'connectors' };
+    const Connector = getConceptConstructor('Connector');
     let connector: Connector;
     if (!options) {
       connector = Connector.from(
@@ -161,7 +161,7 @@ export class Integration extends BaseNode {
         this,
         'connectors',
       );
-    } else if (options instanceof Connector) {
+    } else if (asserts.isConnector(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connector = options;
       Object.assign(connector, relationOptions);

package/src/concepts/InterfaceParam__.ts

@@ -9,8 +9,8 @@ import {
   TranslatorGenerator,
   createCompilerState,
 } from '../translator';
-import StructureProperty from './StructureProperty__';
-import Structure from './Structure__';
+import type StructureProperty from './StructureProperty__';
+import type Structure from './Structure__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 //================================================================================
@@ -18,34 +18,34 @@ import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 Interface from './Interface__';
-import Module from './Module__';
-import App from './App__';
-import Connector from './Connector__';
-import View from './View__';
-import Frontend from './Frontend__';
-import ProcessElement from './ProcessElement__';
-import Process from './Process__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type DefaultValue from './DefaultValue__';
+import type Interface from './Interface__';
+import type Module from './Module__';
+import type App from './App__';
+import type Connector from './Connector__';
+import type View from './View__';
+import type Frontend from './Frontend__';
+import type ProcessElement from './ProcessElement__';
+import type Process from './Process__';
 
 /**
  * 接口参数
  */
-@className
 @concept('接口参数')
-// @ts-ignore
 export class InterfaceParam extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'InterfaceParam';
+  static readonly ConceptName: string = 'InterfaceParam';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -58,14 +58,12 @@ export class InterfaceParam extends BaseNode {
    * 接口参数名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 接口参数描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -74,21 +72,18 @@ export class InterfaceParam extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 参数位置
    */
   @property()
-  // @ts-ignore
   in!: 'query' | 'path' | 'body' | 'header' | 'cookie';
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
@@ -97,7 +92,6 @@ export class InterfaceParam extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -391,7 +385,9 @@ export class InterfaceParam extends BaseNode {
     }
     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)) {
         code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);

package/src/concepts/Interface__.ts

@@ -9,86 +9,80 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import Namespace from './Namespace__';
-import TypeAnnotation from './TypeAnnotation__';
-import Structure from './Structure__';
-import Param from './Param__';
+import type Namespace from './Namespace__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type Structure from './Structure__';
+import type Param from './Param__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 InterfaceParam from './InterfaceParam__';
-import Return from './Return__';
-import BindAttribute from './BindAttribute__';
-import Module from './Module__';
-import Connector from './Connector__';
-import App from './App__';
-import View from './View__';
-import Frontend from './Frontend__';
-import ProcessElement from './ProcessElement__';
-import Process from './Process__';
 import ImportedInterface from './ImportedInterface__';
+import type InterfaceParam from './InterfaceParam__';
+import type Return from './Return__';
+import type BindAttribute from './BindAttribute__';
+import type Module from './Module__';
+import type Connector from './Connector__';
+import type App from './App__';
+import type View from './View__';
+import type Frontend from './Frontend__';
+import type ProcessElement from './ProcessElement__';
+import type Process from './Process__';
 
 /**
  * 接口
  */
-@className
 @concept('接口')
-// @ts-ignore
 export class Interface extends ImportedInterface {
   /** 类名 */
-  static readonly ConceptName = 'Interface';
+  static readonly ConceptName: string = 'Interface';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['ImportedInterface', 'AbstractInterface', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['ImportedInterface', 'AbstractInterface', 'BaseNode'];
 
   /**
    * 产品概念
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Interface';
+  readonly concept!: 'Interface' | 'AuthInterface';
 
   /**
    * 接口名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 导出的来源
    */
   @property()
-  // @ts-ignore
   originLogicName!: string;
 
   /**
    * 接口路径
    */
   @property()
-  // @ts-ignore
   path!: string;
 
   /**
    * 接口方法
    */
   @property()
-  // @ts-ignore
   method!: 'GET' | 'POST' | 'PUT' | 'DELETE';
 
   /**
    * 接口描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -117,7 +111,6 @@ export class Interface extends ImportedInterface {
   @property({
     objectRef: 'BindAttribute',
   })
-  // @ts-ignore
   validation!: BindAttribute;
 
   /**
@@ -244,6 +237,7 @@ export class Interface extends ImportedInterface {
   _insertInterfaceParamAt(options: string | Partial<InterfaceParam> | InterfaceParam, index: number) {
     const interfaceParamOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'params' };
+    const InterfaceParam = getConceptConstructor('InterfaceParam');
     let interfaceParam: InterfaceParam;
     if (!options) {
       interfaceParam = InterfaceParam.from(
@@ -263,7 +257,7 @@ export class Interface extends ImportedInterface {
         this,
         'params',
       );
-    } else if (options instanceof InterfaceParam) {
+    } else if (asserts.isInterfaceParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       interfaceParam = options;
       Object.assign(interfaceParam, relationOptions);
@@ -393,6 +387,7 @@ export class Interface extends ImportedInterface {
   _insertReturnAt(options: string | Partial<Return> | Return, index: number) {
     const retOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'returns' };
+    const Return = getConceptConstructor('Return');
     let ret: Return;
     if (!options) {
       ret = Return.from(
@@ -412,7 +407,7 @@ export class Interface extends ImportedInterface {
         this,
         'returns',
       );
-    } else if (options instanceof Return) {
+    } else if (asserts.isReturn(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       ret = options;
       Object.assign(ret, relationOptions);
@@ -993,7 +988,7 @@ export class Interface extends ImportedInterface {
     const getCheckerCode = function* getCheckerCode() {
       if (self.validation) {
         code += '\n(';
-        code += yield * self.validation.toEmbeddedTS(shiftState(state, code));
+        code += yield* self.validation.toEmbeddedTS(shiftState(state, code));
         code += ');\n';
       }
     };
@@ -1125,7 +1120,7 @@ export class Interface extends ImportedInterface {
   }
 
   deleteRefStructures(includeNameList?: string[]) {
-    if (this.upperNode instanceof Connector) {
+    if (asserts.isConnector(this.upperNode)) {
       const module = this.upperNode;
       const oldStructuresSet = this.getRefStructures(module.structures, includeNameList);
       oldStructuresSet.forEach((s: Structure) => s.delete());

package/src/concepts/JSBlock__.ts

@@ -12,25 +12,24 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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__';
 
 /**
  * JS 代码块
  */
-@className
 @concept('JS 代码块')
-// @ts-ignore
 export class JSBlock extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'JSBlock';
+  static readonly ConceptName: string = 'JSBlock';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -49,7 +48,6 @@ export class JSBlock extends LogicItem {
    * 代码内容
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**

package/src/concepts/JavaLogic__.ts

@@ -12,25 +12,24 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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__';
 
 /**
  * Java 扩展逻辑
  */
-@className
 @concept('Java 扩展逻辑')
-// @ts-ignore
 export class JavaLogic extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'JavaLogic';
+  static readonly ConceptName: string = 'JavaLogic';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -43,21 +42,18 @@ export class JavaLogic extends LogicItem {
    * 包名
    */
   @property()
-  // @ts-ignore
   packageName!: string;
 
   /**
    * className
    */
   @property()
-  // @ts-ignore
   className!: string;
 
   /**
    * 代码内容
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**

package/src/concepts/LogicItem__.ts

@@ -1,4 +1,4 @@
-import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import { runGeneratorSync as runSync } from '../utils/time-slicing';
 import {
   TranslatorState,
   createCompilerState,
@@ -7,43 +7,43 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
-import CallQueryComponent from './CallQueryComponent__';
-import CallInterface from './CallInterface__';
+import type CallQueryComponent from './CallQueryComponent__';
+import type CallInterface from './CallInterface__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 OverriddenLogic from './OverriddenLogic__';
-import Logic from './Logic__';
-import AuthLogic from './AuthLogic__';
-import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
-import Module from './Module__';
-import App from './App__';
-import View from './View__';
-import Frontend from './Frontend__';
-import ProcessElement from './ProcessElement__';
-import Process from './Process__';
-import Connector from './Connector__';
+import type OverriddenLogic from './OverriddenLogic__';
+import type Logic from './Logic__';
+import type AuthLogic from './AuthLogic__';
+import type AuthLogicForCallInterface from './AuthLogicForCallInterface__';
+import type Module from './Module__';
+import type App from './App__';
+import type View from './View__';
+import type Frontend from './Frontend__';
+import type ProcessElement from './ProcessElement__';
+import type Process from './Process__';
+import type Connector from './Connector__';
 
 /**
  * 逻辑项
  */
-@className
 @concept('逻辑项')
-// @ts-ignore
 export class LogicItem extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'LogicItem';
+  static readonly ConceptName: string = 'LogicItem';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -112,14 +112,12 @@ export class LogicItem extends BaseNode {
    * 逻辑项标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 逻辑项描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -132,14 +130,12 @@ export class LogicItem extends BaseNode {
    * offsetX
    */
   @property()
-  // @ts-ignore
   offsetX!: number;
 
   /**
    * offsetY
    */
   @property()
-  // @ts-ignore
   offsetY!: number;
 
   /**
@@ -322,7 +318,7 @@ export class LogicItem extends BaseNode {
    * @returns 生成的代码
    */
   toTS(state?: TranslatorState): string {
-    return this.toJS(state);
+    return runSync(this.toEmbeddedTS(state));
   }
 
   toBrief(): string {
@@ -346,7 +342,7 @@ export class LogicItem extends BaseNode {
    * @returns 生成的代码
    */
   toNaturalTS(state = createCompilerState()): string {
-    return this.toTS(state);
+    return runSync(this.toEmbeddedTS(state));
   }
 
   delete() {