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

package/src/concepts/TriggerLauncher__.ts

@@ -10,22 +10,22 @@ import {
 } from '../translator';
 import type Connector from './Connector__';
 import LogicItem from './LogicItem__';
-import type Identifier from './Identifier__';
 
+import App from './App__';
+import Module from './Module__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } 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 type Module from './Module__';
-import type App from './App__';
+import Identifier from './Identifier__';
 
 /**
  * 触发器启动器
@@ -34,7 +34,11 @@ import type App from './App__';
 export class TriggerLauncher extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'TriggerLauncher';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -44,43 +48,37 @@ export class TriggerLauncher extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'TriggerLauncher' | 'MsgTriggerLauncher';
-
   /**
    * 触发器启动器名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * calleeNamespace
    */
-  @property()
-  calleeNamespace!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property()
-  calleeName!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeName: string;
 
   /**
    * callBackLogic
    */
-  @property()
-  callBackLogic!: Identifier;
-
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
+  @property({
+    objectRef: 'Identifier',
+  })
+  callBackLogic: Identifier;
 
   /**
    * @param source 需要合并的部分参数
@@ -95,17 +93,6 @@ export class TriggerLauncher extends BaseNode {
     return super.from(source, parentNode, parentKey) as TriggerLauncher;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeTriggerLauncher?.(this);
-    }
-    return params;
-  }
   /**
    * 设置触发器启动器名称
    */
@@ -147,6 +134,9 @@ export class TriggerLauncher extends BaseNode {
    * 设置callBackLogic
    */
   setCallBackLogic(callBackLogic: Identifier) {
+    callBackLogic._delete();
+    const relationOptions = { parentNode: this, parentKey: 'callBackLogic' };
+    Object.assign(callBackLogic, relationOptions);
     const object = {
       callBackLogic,
     };
@@ -159,6 +149,12 @@ export class TriggerLauncher extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  /**
+   * 祖先 Module
+   */
+  get module() {
+    return this.getAncestor('Module') as Module;
+  }
 
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {

package/src/concepts/TypeAnnotation__.ts

@@ -9,6 +9,7 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  transfromMetadataType,
 } from '../translator';
 import { genHash } from '../generator';
 import { firstUpperCase } from '../utils/string';
@@ -102,14 +103,14 @@ export function isUnion(typeAnnotation: TypeAnnotation): boolean {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } 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 type StructureProperty from './StructureProperty__';
+import StructureProperty from './StructureProperty__';
 
 /**
  * 类型标注
@@ -118,7 +119,11 @@ import type StructureProperty from './StructureProperty__';
 export class TypeAnnotation extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'TypeAnnotation';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -128,24 +133,29 @@ export class TypeAnnotation extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'TypeAnnotation';
-
   /**
    * 类型种类
    */
-  @property()
-  typeKind!: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure';
+  @property({
+    objectRef: '',
+  })
+  typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure';
 
   /**
    * 类型命名空间
    */
-  @property()
-  typeNamespace!: string;
+  @property({
+    objectRef: '',
+  })
+  typeNamespace: string;
 
   /**
    * 类型名称
    */
-  @property()
-  typeName!: string;
+  @property({
+    objectRef: '',
+  })
+  typeName: string;
 
   /**
    * 类型参数
@@ -170,8 +180,10 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 是否是推断出来的
    */
-  @property()
-  inferred!: boolean;
+  @property({
+    objectRef: '',
+  })
+  inferred: boolean;
 
   /**
    * 匿名数据结构属性
@@ -186,8 +198,10 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 规则对象
    */
-  @property()
-  ruleMap!: Object;
+  @property({
+    objectRef: '',
+  })
+  ruleMap: Map<string, number>;
 
   /**
    * @param source 需要合并的部分参数
@@ -202,21 +216,10 @@ export class TypeAnnotation extends BaseNode {
     return super.from(source, parentNode, parentKey) as TypeAnnotation;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeTypeAnnotation?.(this);
-    }
-    return params;
-  }
   /**
    * 设置规则对象
    */
-  setRuleMap(ruleMap: Object) {
+  setRuleMap(ruleMap: Map<string, number>) {
     const object = {
       ruleMap,
     };
@@ -550,37 +553,6 @@ export class TypeAnnotation extends BaseNode {
     return typeAnnotation.delete();
   }
 
-  __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeAnnotation.__v_raw || typeAnnotation;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除数据结构属性
    * @param structureProperty 已有的数据结构属性实例
@@ -592,37 +564,6 @@ export class TypeAnnotation extends BaseNode {
     return structureProperty.delete();
   }
 
-  __removeStructureProperty(structureProperty: StructureProperty) {
-    const parentKey = structureProperty.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: structureProperty,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = structureProperty.__v_raw || structureProperty;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -673,6 +614,7 @@ export class TypeAnnotation extends BaseNode {
 
   // 排过序的类型标识
   get sortedTypeKey(): string {
+    const app = this.app;
     if (this.typeKind === 'anonymousStructure') {
       // 按匿名数据结构的key排序
       return `{${[...this.properties]
@@ -682,24 +624,35 @@ export class TypeAnnotation extends BaseNode {
     } else if (this.typeKind === 'union') {
       // 按返回的每个具体项排序
       return `${this.typeArguments
-        .map((arg) => arg?.sortedTypeKey)
+        .map((arg) => transfromMetadataType(arg, app)?.sortedTypeKey)
         .sort((name1, name2) => (name1 > name2 ? 1 : -1))
-        .join(' | ')}`;
+        .join(' | ')}`
+    }
+    let { typeNamespace, typeName, typeKind } = this
+    // 统一处理元数据sortedTypeKey值，不需要再在每个调用sortedTypeKey单独处理
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app?.findNodeByCompleteName?.(typeNamespace + '.' + typeName);
+      const typeAn = referenceNode?.typeAnnotation
+      if (typeAn) {
+        typeKind = typeAn.typeKind;
+        typeNamespace = typeAn.typeNamespace;
+        typeName = typeAn.typeName;
+      }
     }
     const typeArr = [];
-    if (this.typeNamespace) {
-      typeArr.push(this.typeNamespace);
+    if (typeNamespace) {
+      typeArr.push(typeNamespace);
     }
-    if (this.typeName) {
-      typeArr.push(this.typeName);
+    if (typeName) {
+      typeArr.push(typeName);
     }
     const typeKey = typeArr.join('.');
-    if (this.typeKind === 'generic') {
+    if (typeKind === 'generic') {
       let code = typeKey;
       code += '<';
       if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
         // 必须按typeArguments定义的顺序，否则实参位置不对
-        code += `${(this.typeArguments || []).map((arg) => arg?.sortedTypeKey).join(', ')}`;
+        code += `${(this.typeArguments || []).map((arg) => transfromMetadataType(arg, app)?.sortedTypeKey).join(', ')}`;
       }
       code += '>';
       return code;
@@ -1203,10 +1156,7 @@ export class TypeAnnotation extends BaseNode {
   typeArgumentsPush(typeItem: TypeAnnotation) {
     if (asserts.isTypeAnnotation(typeItem)) {
       this.typeArguments.push(
-        TypeAnnotation.from(typeItem, {
-          parentNode: this,
-          parentKey: 'typeArguments',
-        }),
+        TypeAnnotation.from(typeItem, this, 'typeArguments'),
       );
     }
   }

package/src/concepts/TypeParam__.ts

@@ -13,7 +13,7 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
@@ -28,7 +28,11 @@ import BaseNode from '../common/BaseNode';
 export class TypeParam extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'TypeParam';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -38,12 +42,13 @@ export class TypeParam extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'TypeParam';
-
   /**
    * 类型名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/UnaryExpression__.ts

@@ -15,12 +15,13 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } 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 LogicItem from './LogicItem__';
 
 /**
@@ -30,7 +31,11 @@ import LogicItem from './LogicItem__';
 export class UnaryExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'UnaryExpression';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -40,20 +45,21 @@ export class UnaryExpression extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'UnaryExpression';
-
   /**
    * 参数
    */
   @property({
     objectRef: 'LogicItem',
   })
-  argument!: LogicItem;
+  argument: LogicItem;
 
   /**
    * 运算符
    */
-  @property()
-  operator!: '!' | 'isNull';
+  @property({
+    objectRef: '',
+  })
+  operator: '!' | 'isNull';
 
   /**
    * @param source 需要合并的部分参数
@@ -83,62 +89,6 @@ export class UnaryExpression extends LogicItem {
     });
   }
 
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeArgument(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param argument 已有的逻辑项实例
-   */
-  removeArgument(argument: LogicItem): void;
-
-  removeArgument(options: string | LogicItem) {
-    let argument: LogicItem;
-    if (typeof options === 'string') {
-      argument = this.argument;
-      if (!argument) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      argument = options;
-    }
-    return argument.delete();
-  }
-
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/Unparsed__.ts

@@ -13,12 +13,13 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } 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 LogicItem from './LogicItem__';
 
 /**
@@ -28,7 +29,11 @@ import LogicItem from './LogicItem__';
 export class Unparsed extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'Unparsed';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -38,12 +43,13 @@ export class Unparsed extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Unparsed';
-
   /**
    * 表达式代码
    */
-  @property()
-  code!: string;
+  @property({
+    objectRef: '',
+  })
+  code: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/UseComponent__.ts

@@ -3,7 +3,7 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
@@ -18,7 +18,11 @@ import BaseNode from '../common/BaseNode';
 export class UseComponent extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'UseComponent';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -28,18 +32,21 @@ export class UseComponent extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'UseComponent';
-
   /**
    * type
    */
-  @property()
-  type!: string;
+  @property({
+    objectRef: '',
+  })
+  type: string;
 
   /**
    * 需要传入的属性
    */
-  @property()
-  attrs!: Object;
+  @property({
+    objectRef: '',
+  })
+  attrs: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -54,18 +61,6 @@ export class UseComponent extends BaseNode {
     return super.from(source, parentNode, parentKey) as UseComponent;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeUseComponent?.(this);
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。