@lcap/nasl 3.7.1-beta.1 → 3.7.2-alpha.1

package/src/concepts/Structure__.ts

@@ -10,6 +10,7 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
@@ -54,27 +55,15 @@ export class Structure extends BaseNode {
   /**
    * 数据结构名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 数据结构描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
-  /**
-   * 数据结构来源
-   */
-  @property({
-    objectRef: '',
-  })
-  origin: 'CallQueryComponent';
-
   /**
    * 类型参数列表
    */
@@ -83,7 +72,7 @@ export class Structure extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeParams?: Array<TypeParam> = null;
+  typeParams?: Array<TypeParam>;
 
   /**
    * 数据结构属性列表
@@ -528,7 +517,7 @@ export class Structure extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || this.origin === 'CallQueryComponent' || this.isConnector;
+    return !!this.module || this.isConnector;
   }
 
   /* 删除空数据模块 */
@@ -566,13 +555,22 @@ export class Structure extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = `class ${this.name}`;
+    let code = '';
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['description']);
+    code = `class ${this.name}`;
 
     if (this.typeParams?.length) {
-      code += `<${this.typeParams.map((item) => item.toNaturalTS(shiftState(state, code, { inline: true }))).join(', ')}>`;
+      code += `<${this.typeParams
+        .map((item) => item.toNaturalTS(shiftState(state, code, { inline: true })))
+        .join(', ')}>`;
     }
 
-    code += ` {\n`;
+    code += ` {`;
+    if (state.descriptionComment && this.description)
+      code += `/* ${this.description} */`;
+    code += '\n';
+
     // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
     this.properties.forEach((property) => {
       code += indent(state.tabSize + 1);
@@ -591,7 +589,9 @@ export class Structure extends BaseNode {
 
     code += `struct ${this.name}`;
     if (this.typeParams?.length) {
-      code += `<${this.typeParams.map((item) => item.toNaturalTS(shiftState(state, code, { inline: true }))).join(', ')}>`;
+      code += `<${this.typeParams
+        .map((item) => item.toNaturalTS(shiftState(state, code, { inline: true })))
+        .join(', ')}>`;
     }
 
     code += ` {\n`;

package/src/concepts/SwitchCase__.ts

@@ -50,7 +50,7 @@ export class SwitchCase extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  test: LogicItem;
+  test?: LogicItem;
 
   /**
    * then

package/src/concepts/SwitchStatement__.ts

@@ -256,7 +256,7 @@ export class SwitchStatement extends LogicItem {
   toTextualNASL(state = createCompilerState()): string {
     let code = 'switch {\n';
     this.cases.forEach((item, index) => {
-        code += item.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+      code += item.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1 }));
     });
     code += `${indent(state.tabSize)}}\n`;
     return code;

package/src/concepts/ThemeVariable__.ts

@@ -35,9 +35,7 @@ export class ThemeVariable extends BaseNode {
   /**
    * 主题变量名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string;
 
   /**

package/src/concepts/Theme__.ts

@@ -35,17 +35,13 @@ export class Theme extends BaseNode {
   /**
    * 主题标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string = '默认主题样式';
 
   /**
    * 主题变量 Map
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   variableMap: {
     [name: string]: string;
   } = {};

package/src/concepts/Transactional__.ts

@@ -1,7 +1,4 @@
-import {
-  withSourceMap,
-  createCompilerState,
-} from '../translator';
+import { withSourceMap, createCompilerState } from '../translator';
 import Logic from './Logic__';
 import Module from './Module__';
 import Connector from './Connector__';
@@ -46,26 +43,20 @@ export class Transactional extends BaseNode {
   /**
    * 事务是否生效
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   enabled: boolean;
 
   /**
    * 事务的传播机制
    */
-  @property({
-    objectRef: '',
-  })
-  propagation: 'REQUIRED' | 'REQUIRES_NEW' | 'SUPPORTS' | 'NOT_SUPPORTED' | 'MANDATORY' | 'NEVER';
+  @property()
+  propagation?: 'REQUIRED' | 'REQUIRES_NEW' | 'SUPPORTS' | 'NOT_SUPPORTED' | 'MANDATORY' | 'NEVER';
 
   /**
    * 事务的隔离级别
    */
-  @property({
-    objectRef: '',
-  })
-  isolation: 'DEFAULT' | 'READ_UNCOMMITTED' | 'READ_COMMITTED' | 'REPEATABLE_READ' | 'SERIALIZABLE';
+  @property()
+  isolation?: 'DEFAULT' | 'READ_UNCOMMITTED' | 'READ_COMMITTED' | 'REPEATABLE_READ' | 'SERIALIZABLE';
 
   /**
    * @param source 需要合并的部分参数
@@ -116,15 +107,15 @@ export class Transactional extends BaseNode {
     });
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     return '';
   }
 
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
   /**
    * 祖先 Logic
    */

package/src/concepts/TriggerEvent__.ts

@@ -36,9 +36,7 @@ export abstract class TriggerEvent extends BaseNode {
   /**
    * 触发器事件名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**

package/src/concepts/TriggerLauncher__.ts

@@ -13,6 +13,7 @@ import LogicItem from './LogicItem__';
 
 import App from './App__';
 import Module from './Module__';
+import ConnectorTriggerLauncher from './ConnectorTriggerLauncher__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -26,7 +27,6 @@ import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import BaseNode from '../common/BaseNode';
 import Identifier from './Identifier__';
-import ConnectorTriggerLauncher from './ConnectorTriggerLauncher__';
 
 /**
  * 触发器启动器
@@ -52,25 +52,19 @@ export class TriggerLauncher extends BaseNode {
   /**
    * 触发器启动器名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeName: string;
 
   /**
@@ -166,12 +160,14 @@ export class TriggerLauncher extends BaseNode {
       // console.log('test', self.connectorTrigger?.triggerEvent.callBackLogic.typeArguments[0])
       // 仅仅作引用查找不需要入参校验
       if (self.concept === 'ConnectorTriggerLauncher') {
-        const connectorTrigger = (self as unknown as ConnectorTriggerLauncher).connectorTrigger
-        code += `let trigger = connector.${(self as unknown as ConnectorTriggerLauncher).connector.name}.triggers.${connectorTrigger.tsName}();\n`
-        let stashParams = ''
-        code += `let params: typeof trigger.params\n`
+        const connectorTrigger = (self as unknown as ConnectorTriggerLauncher).connectorTrigger;
+        code += `let trigger = connector.${(self as unknown as ConnectorTriggerLauncher).connector.name}.triggers.${
+          connectorTrigger.tsName
+        }();\n`;
+        let stashParams = '';
+        code += `let params: typeof trigger.params\n`;
         if (connectorTrigger?.triggerEvent?.callBackLogic?.typeArguments?.[0]) {
-          stashParams = 'params'
+          stashParams = 'params';
         }
         code += `let result: typeof trigger.result`;
         code += ` = ${self.callBackLogicKey}(${stashParams})`;

package/src/concepts/TypeAnnotation__.ts

@@ -137,25 +137,19 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 类型种类
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure';
 
   /**
    * 类型命名空间
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   typeNamespace: string;
 
   /**
    * 类型名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   typeName: string;
 
   /**
@@ -166,7 +160,7 @@ export class TypeAnnotation extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeArguments?: Array<TypeAnnotation> = null;
+  typeArguments?: Array<TypeAnnotation>;
 
   /**
    * 返回类型
@@ -176,14 +170,12 @@ export class TypeAnnotation extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  returnType?: Array<TypeAnnotation> = null;
+  returnType?: Array<TypeAnnotation>;
 
   /**
    * 是否是推断出来的
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   inferred: boolean;
 
   /**
@@ -194,15 +186,13 @@ export class TypeAnnotation extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  properties?: Array<StructureProperty> = null;
+  properties?: Array<StructureProperty>;
 
   /**
    * 规则对象
    */
-  @property({
-    objectRef: '',
-  })
-  ruleMap: Map<string, number>;
+  @property()
+  ruleMap: Record<string, number>;
 
   /**
    * @param source 需要合并的部分参数
@@ -220,7 +210,7 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 设置规则对象
    */
-  setRuleMap(ruleMap: Map<string, number>) {
+  setRuleMap(ruleMap: Record<string, number>) {
     const object = {
       ruleMap,
     };
@@ -713,10 +703,11 @@ export class TypeAnnotation extends BaseNode {
     } else if (this.typeKind === 'reference') {
       return this.typeName;
     } else if (this.typeKind === 'generic') {
-      return `${this.typeName}<${!this.typeArguments?.length
-        ? 'T'
-        : this.typeArguments.map((arg) => arg?.typeTitle || arg?.name || 'T').join(', ')
-        }>`;
+      return `${this.typeName}<${
+        !this.typeArguments?.length
+          ? 'T'
+          : this.typeArguments.map((arg) => arg?.typeTitle || arg?.name || 'T').join(', ')
+      }>`;
     } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties
         ?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation?.typeTitle : '未知'}`)
@@ -740,10 +731,11 @@ export class TypeAnnotation extends BaseNode {
     } else if (this.typeKind === 'reference') {
       return this.typeName;
     } else if (this.typeKind === 'generic') {
-      return `${this.typeName}<${!this?.typeArguments?.length
-        ? 'T'
-        : this.typeArguments.map((arg) => arg?.typeInlineTitle || arg?.name || 'T').join(', ')
-        }>`;
+      return `${this.typeName}<${
+        !this?.typeArguments?.length
+          ? 'T'
+          : this.typeArguments.map((arg) => arg?.typeInlineTitle || arg?.name || 'T').join(', ')
+      }>`;
     } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties
         ?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation?.typeInlineTitle : '未知'}`)
@@ -961,12 +953,13 @@ export class TypeAnnotation extends BaseNode {
       let code = `{ `;
       yield* wrapForEach(self.properties || [], function* warpForEachGenerator(property, i) {
         code += `${property.name}: `;
-        code += `${property.typeAnnotation
-          ? yield* property.typeAnnotation.toEmbeddedTS(
-            shiftState(state, code, { inline: true, tabSize: (state?.tabSize || 0) + 1 }),
-          )
-          : '`未知`'
-          }`;
+        code += `${
+          property.typeAnnotation
+            ? yield* property.typeAnnotation.toEmbeddedTS(
+                shiftState(state, code, { inline: true, tabSize: (state?.tabSize || 0) + 1 }),
+              )
+            : '`未知`'
+        }`;
         code += ', ';
       });
       code += `__name: "AStructure_${self.hash}" `;
@@ -986,7 +979,11 @@ export class TypeAnnotation extends BaseNode {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
-      if (this.typeKind === 'reference' && this.typeNamespace && this.typeNamespace.match(/\.(enums|entities|structures)$/)) {
+      if (
+        this.typeKind === 'reference' &&
+        this.typeNamespace &&
+        this.typeNamespace.match(/\.(enums|entities|structures)$/)
+      ) {
         if (this.tsCalleeNamespace.startsWith('nasl.ui')) {
           return `${this.tsCalleeNamespace}.${this.typeName}`;
         }
@@ -1036,8 +1033,7 @@ export class TypeAnnotation extends BaseNode {
   @withSourceMap()
   toTextualNASL(state = createCompilerState()): string {
     if (this.typeKind === 'primitive') {
-      if (this.typeName === 'Long')
-        return 'Integer';
+      if (this.typeName === 'Long') return 'Integer';
       return this.typeName;
     } else if (this.typeKind === 'reference') {
       return textualNamespace(`${this.typeNamespace}.${this.typeName}`);
@@ -1228,9 +1224,22 @@ export class TypeAnnotation extends BaseNode {
     // 由于 序列化 出来的 TypeAnnotation 会有很多多余的属性
     // 因此增加白名单，只有这些值才会被比较，其他均会被忽略
     const whiteList = [
-      'concept', 'typeKind', 'typeNamespace', 'typeName', 'typeArguments',
-      'returnType', 'inferred', 'ruleMap', 'properties', 'name', 'label',
-      'description', 'typeAnnotation', 'required', 'defaultValue', 'jsonName'
+      'concept',
+      'typeKind',
+      'typeNamespace',
+      'typeName',
+      'typeArguments',
+      'returnType',
+      'inferred',
+      'ruleMap',
+      'properties',
+      'name',
+      'label',
+      'description',
+      'typeAnnotation',
+      'required',
+      'defaultValue',
+      'jsonName',
     ];
     const typeAnnotation1 = this.toJSON();
     const typeAnnotation2 = typeAnnotation.toJSON();
@@ -1355,7 +1364,7 @@ export class TypeAnnotation extends BaseNode {
     this.properties.splice(index, 0, property);
     return property;
   }
-  
+
   _addProperty(options?: string | Partial<StructureProperty> | StructureProperty) {
     const index = this.properties.length;
     return this._insertPropertyAt(options as any, index);

package/src/concepts/TypeParam__.ts

@@ -45,9 +45,7 @@ export class TypeParam extends BaseNode {
   /**
    * 类型名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**

package/src/concepts/UnaryExpression__.ts

@@ -56,9 +56,7 @@ export class UnaryExpression extends LogicItem {
   /**
    * 运算符
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   operator: '!' | 'isNull';
 
   /**

package/src/concepts/Unparsed__.ts

@@ -46,9 +46,7 @@ export class Unparsed extends LogicItem {
   /**
    * 表达式代码
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**

package/src/concepts/UseComponent__.ts

@@ -35,17 +35,13 @@ export class UseComponent extends BaseNode {
   /**
    * type
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: string;
 
   /**
    * 需要传入的属性
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   attrs: string;
 
   /**

package/src/concepts/ValidationRule__.ts

@@ -56,17 +56,13 @@ export class ValidationRule extends LogicItem {
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeName: string;
 
   /**
@@ -85,7 +81,7 @@ export class ValidationRule extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  errorMessage?: LogicItem = null;
+  errorMessage?: LogicItem;
 
   /**
    * 验证对象
@@ -93,14 +89,12 @@ export class ValidationRule extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  target?: LogicItem = null;
+  target?: LogicItem;
 
   /**
    * 是否启用服务端验证
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   enableServerValidation?: boolean = true;
 
   /**
@@ -276,12 +270,7 @@ export class ValidationRule extends LogicItem {
   //================================================================================
 
   public static getDefaultOptions() {
-    return {
-      target: {
-        concept: 'Identifier',
-        name: '',
-      },
-    };
+    return {};
   }
 
   toInViewMethod() {

package/src/concepts/Variable__.ts

@@ -76,18 +76,14 @@ export class Variable extends BaseNode {
   /**
    * 变量名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 变量描述
    */
-  @property({
-    objectRef: '',
-  })
-  description: string;
+  @property()
+  description?: string;
 
   /**
    * 类型
@@ -103,7 +99,7 @@ export class Variable extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue?: DefaultValue = null;
+  defaultValue?: DefaultValue;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/ViewBlockWithImage__.ts

@@ -36,17 +36,13 @@ export class ViewBlockWithImage extends ViewBlock {
   /**
    * 截图
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   screenshot: string;
 
   /**
    * 手绘
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   drawing: string;
 
   /**

package/src/concepts/ViewBlock__.ts

@@ -35,26 +35,20 @@ export class ViewBlock extends BaseNode {
   /**
    * 标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 代码
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**
    * 描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * @param source 需要合并的部分参数