@lcap/nasl 3.7.1-beta.1 → 3.7.1-beta.3

package/src/concepts/Return__.ts

@@ -69,17 +69,13 @@ export class Return extends BaseNode {
   /**
    * 输出参数名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 输出参数描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -88,7 +84,7 @@ export class Return extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 默认值
@@ -96,7 +92,7 @@ export class Return extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue?: DefaultValue = null;
+  defaultValue?: DefaultValue;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/Role__.ts

@@ -48,34 +48,26 @@ export class Role extends BaseNode {
   /**
    * 角色名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 唯一标识
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   uuid: string = createUUID();
 
   /**
-   * 创建时间
+   * 角色描述
    */
-  @property({
-    objectRef: '',
-  })
-  createdTime: string;
+  @property()
+  description: string;
 
   /**
-   * 角色描述
+   * 创建时间
    */
-  @property({
-    objectRef: '',
-  })
-  description: string;
+  @property()
+  createdTime?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/SelectMembers__.ts

@@ -49,9 +49,7 @@ export class SelectMembers extends BaseNode {
   /**
    * hideMembers
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   hideMembers: boolean = false;
 
   /**

package/src/concepts/SetterOption__.ts

@@ -35,50 +35,38 @@ export class SetterOption extends BaseNode {
   /**
    * 选项值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**
    * 选项标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 选项图标
    */
-  @property({
-    objectRef: '',
-  })
-  icon?: string = null;
+  @property()
+  icon?: string;
 
   /**
    * 选项工具提示
    */
-  @property({
-    objectRef: '',
-  })
-  tooltip?: string = null;
+  @property()
+  tooltip?: string;
 
   /**
    * 是否显隐
    */
-  @property({
-    objectRef: '',
-  })
-  tsIf?: string = null;
+  @property()
+  tsIf?: string;
 
   /**
    * 是否禁用
    */
-  @property({
-    objectRef: '',
-  })
-  tsDisabledIf?: string = null;
+  @property()
+  tsDisabledIf?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/SlotDeclaration__.ts

@@ -37,33 +37,25 @@ export class SlotDeclaration extends BaseNode {
   /**
    * 插槽名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 插槽标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 插槽描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * 类型
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   tsType: string;
 
   /**
@@ -79,10 +71,8 @@ export class SlotDeclaration extends BaseNode {
   /**
    * 空的占位图
    */
-  @property({
-    objectRef: '',
-  })
-  emptyBackground?: string = null;
+  @property()
+  emptyBackground?: string;
 
   /**
    * 插槽代码块

package/src/concepts/SqlQueryComponent__.ts

@@ -52,9 +52,7 @@ export class SqlQueryComponent extends LogicItem {
   /**
    * SQL 查询
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**
@@ -68,17 +66,13 @@ export class SqlQueryComponent extends LogicItem {
   /**
    * 数据源
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   dataSource: string;
 
   /**
    * 查询组件的局部版本
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   ideVersion: string;
 
   /**
@@ -238,10 +232,8 @@ export class SqlQueryComponent extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const code = this.code
-      .replace(/\.(\d+)\}/g, '[$1]}')
-      .replace(/`/g, '\\`'); // 处理枚举 TS 转不回来的情况 ${app.enums.NetStatusEnum.1}
-      return `nasl.oql.query(\`${code}\`)`;
+    const code = this.code.replace(/\.(\d+)\}/g, '[$1]}').replace(/`/g, '\\`'); // 处理枚举 TS 转不回来的情况 ${app.enums.NetStatusEnum.1}
+    return `nasl.oql.query(\`${code}\`)`;
   }
 
   /**

package/src/concepts/StaticString__.ts

@@ -1,8 +1,4 @@
-import {
-  withSourceMap,
-  createCompilerState,
-  createDecoratorCode,
-} from '../translator';
+import { withSourceMap, createCompilerState, createDecoratorCode } from '../translator';
 import type App from './App__';
 import type View from './View__';
 import type Frontend from './Frontend__';
@@ -43,18 +39,14 @@ export class StaticString extends BaseNode {
   /**
    * 字符串的值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**
    * 国际化键
    */
-  @property({
-    objectRef: '',
-  })
-  i18nKey: string;
+  @property()
+  i18nKey?: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -69,6 +61,11 @@ export class StaticString extends BaseNode {
     return super.from(source, parentNode, parentKey) as StaticString;
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
   /**
    * 设置字符串的值
    */
@@ -81,10 +78,6 @@ export class StaticString extends BaseNode {
     });
   }
 
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
   /**
    * 祖先 View
    */

package/src/concepts/StringLiteral__.ts

@@ -46,18 +46,14 @@ export class StringLiteral extends LogicItem {
   /**
    * 字面量的值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string = '';
 
   /**
    * 国际化键
    */
-  @property({
-    objectRef: '',
-  })
-  i18nKey: string;
+  @property()
+  i18nKey?: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -165,10 +161,8 @@ export class StringLiteral extends LogicItem {
   @withSourceMap()
   toTextualNASL(state = createCompilerState()): string {
     const code = this.value;
-    if (this.parentNode?.concept === 'StringInterpolation')
-      return code;
-    else
-      return `'${code}'`;
+    if (this.parentNode?.concept === 'StringInterpolation') return code;
+    else return `'${code}'`;
   }
 
   /**

package/src/concepts/StructureProperty__.ts

@@ -56,26 +56,20 @@ export class StructureProperty extends BaseNode {
   /**
    * 数据结构属性名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 数据结构属性标题
    */
-  @property({
-    objectRef: '',
-  })
-  label: string;
+  @property()
+  label?: string;
 
   /**
    * 数据结构属性描述
    */
-  @property({
-    objectRef: '',
-  })
-  description: string;
+  @property()
+  description?: string;
 
   /**
    * 类型
@@ -83,7 +77,7 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 默认值
@@ -91,15 +85,13 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue: DefaultValue;
+  defaultValue?: DefaultValue;
 
   /**
    * 数据结构字段 JSON 的序列化别名
    */
-  @property({
-    objectRef: '',
-  })
-  jsonName: string;
+  @property()
+  jsonName?: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -294,7 +286,7 @@ export class StructureProperty extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || (this.parentNode as Structure).origin === 'CallQueryComponent' || this.isConnector;
+    return !!this.module || this.isConnector;
   }
 
   //================================================================================

package/src/concepts/Structure__.ts

@@ -54,27 +54,15 @@ export class Structure extends BaseNode {
   /**
    * 数据结构名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 数据结构描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
-  /**
-   * 数据结构来源
-   */
-  @property({
-    objectRef: '',
-  })
-  origin: 'CallQueryComponent';
-
   /**
    * 类型参数列表
    */
@@ -83,7 +71,7 @@ export class Structure extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeParams?: Array<TypeParam> = null;
+  typeParams?: Array<TypeParam>;
 
   /**
    * 数据结构属性列表
@@ -528,7 +516,7 @@ export class Structure extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || this.origin === 'CallQueryComponent' || this.isConnector;
+    return !!this.module || this.isConnector;
   }
 
   /* 删除空数据模块 */
@@ -569,7 +557,9 @@ export class Structure extends BaseNode {
     let 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`;
@@ -591,7 +581,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})`;