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

package/src/concepts/TriggerLauncher__.ts

@@ -8,35 +8,35 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import Connector from './Connector__';
+import type Connector from './Connector__';
 import LogicItem from './LogicItem__';
-import Identifier from './Identifier__';
+import type Identifier from './Identifier__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 Module from './Module__';
-import App from './App__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 触发器启动器
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -49,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

@@ -1,6 +1,6 @@
 import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
-import App from './App__';
-import Structure from './Structure__';
+import type App from './App__';
+import type Structure from './Structure__';
 import {
   TranslatorState,
   shiftState,
@@ -102,25 +102,25 @@ export function isUnion(typeAnnotation: TypeAnnotation): boolean {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 StructureProperty from './StructureProperty__';
+import type StructureProperty from './StructureProperty__';
 
 /**
  * 类型标注
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -133,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;
 
   /**
@@ -174,7 +171,6 @@ export class TypeAnnotation extends BaseNode {
    * 是否是推断出来的
    */
   @property()
-  // @ts-ignore
   inferred!: boolean;
 
   /**
@@ -191,7 +187,6 @@ export class TypeAnnotation extends BaseNode {
    * 规则对象
    */
   @property()
-  // @ts-ignore
   ruleMap!: Object;
 
   /**
@@ -247,8 +242,9 @@ export class TypeAnnotation extends BaseNode {
   _insertTypeAnnotationInTypeArgumentsAt(options: Partial<TypeAnnotation> | TypeAnnotation, index: number) {
     const typeAnnotationOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
     let typeAnnotation: TypeAnnotation;
-    if (options instanceof TypeAnnotation) {
+    if (asserts.isTypeAnnotation(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeAnnotation = options;
       Object.assign(typeAnnotation, relationOptions);
@@ -347,8 +343,9 @@ export class TypeAnnotation extends BaseNode {
   _insertTypeAnnotationInReturnTypeAt(options: Partial<TypeAnnotation> | TypeAnnotation, index: number) {
     const typeAnnotationOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'returnType' };
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
     let typeAnnotation: TypeAnnotation;
-    if (options instanceof TypeAnnotation) {
+    if (asserts.isTypeAnnotation(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeAnnotation = options;
       Object.assign(typeAnnotation, relationOptions);
@@ -447,8 +444,9 @@ export class TypeAnnotation extends BaseNode {
   _insertStructurePropertyAt(options: Partial<StructureProperty> | StructureProperty, index: number) {
     const structurePropertyOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'properties' };
+    const StructureProperty = getConceptConstructor('StructureProperty');
     let structureProperty: StructureProperty;
-    if (options instanceof StructureProperty) {
+    if (asserts.isStructureProperty(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       structureProperty = options;
       Object.assign(structureProperty, relationOptions);
@@ -1203,7 +1201,7 @@ export class TypeAnnotation extends BaseNode {
   }
   // 增加插入泛型子类型
   typeArgumentsPush(typeItem: TypeAnnotation) {
-    if (typeItem instanceof TypeAnnotation) {
+    if (asserts.isTypeAnnotation(typeItem)) {
       this.typeArguments.push(
         TypeAnnotation.from(typeItem, {
           parentNode: this,
@@ -1244,13 +1242,19 @@ export class TypeAnnotation extends BaseNode {
     typeAnnotation.typeArguments;
     const typeAnnotation1 = this.toJSON();
     const typeAnnotation2 = typeAnnotation.toJSON();
+    const ignoreNull = (key: any, value: any) => {
+      if (value === null || value === undefined) {
+        return undefined; // 忽略此属性
+      }
+      return value; // 其他情况下返回原始值
+    }
     if (typeAnnotation1.typeArguments) {
       typeAnnotation1.typeArguments = this.sortedTypeKey;
     }
     if (typeAnnotation2.typeArguments) {
       typeAnnotation2.typeArguments = typeAnnotation?.sortedTypeKey;
     }
-    return JSON.stringify(typeAnnotation1) === JSON.stringify(typeAnnotation2);
+    return JSON.stringify(typeAnnotation1, ignoreNull) === JSON.stringify(typeAnnotation2, ignoreNull);
   }
 
   // 是否是系统类型

package/src/concepts/TypeParam__.ts

@@ -13,24 +13,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';
 
 /**
  * 类型参数
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -43,7 +43,6 @@ export class TypeParam extends BaseNode {
    * 类型名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**

package/src/concepts/UnaryExpression__.ts

@@ -15,25 +15,24 @@ 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 LogicItem from './LogicItem__';
 
 /**
  * 一元表达式
  */
-@className
 @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

@@ -13,25 +13,24 @@ 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 LogicItem from './LogicItem__';
 
 /**
  * 未解析的
  */
-@className
 @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;
 
   /**
@@ -85,7 +83,7 @@ export class Unparsed extends LogicItem {
     return this.code || '';
   }
 
-  toJS(): string {
+  toJS(state?: TranslatorState): string {
     return this.code || '';
   }
 

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

package/src/concepts/ValidationRule__.ts

@@ -9,37 +9,36 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import Function from './Function__';
+import type Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getValidationInFunction } from '../server/getFunctions';
 import defaultErrorMessage = require('../service/defaultErrorMessage.json');
-import BindAttribute from './BindAttribute__';
+import type BindAttribute from './BindAttribute__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 Argument from './Argument__';
 import LogicItem from './LogicItem__';
+import type Argument from './Argument__';
 
 /**
  * 验证规则
  */
-@className
 @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;
 
   /**
@@ -174,8 +169,9 @@ export class ValidationRule extends LogicItem {
   _insertArgumentAt(options: Partial<Argument> | Argument, index: number) {
     const argumentOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'arguments' };
+    const Argument = getConceptConstructor('Argument');
     let argument: Argument;
-    if (options instanceof Argument) {
+    if (asserts.isArgument(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       argument = options;
       Object.assign(argument, relationOptions);
@@ -485,14 +481,14 @@ export class ValidationRule extends LogicItem {
     if (this.arguments.length) {
       let args = '[';
       this.arguments?.forEach((arg, index) => {
-        args += arg?.toJS(shiftState(state, code));
+        args += arg?.toJS(state);
         if (index !== this.arguments?.length - 1) args += ', ';
       });
       args += ']';
       code += `args: ${args},`;
     }
     code += `trigger: 'input+blur',`;
-    code += `message: ${this.errorMessage?.toJS(shiftState(state, code))}`;
+    code += `message: ${this.errorMessage?.toJS(state)}`;
     code += '}';
     return code;
   }
@@ -561,6 +557,7 @@ export class ValidationRule extends LogicItem {
   }
 
   setCallee(func: Function) {
+    const Argument = getConceptConstructor('Argument');
     const calleeNamespace = func.getNamespace();
     const calleeName = func.name;
     const params = func.params.map((param) => {