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

package/src/concepts/QueryJoinExpression__.ts

@@ -49,33 +49,25 @@ export class QueryJoinExpression extends LogicItem {
   /**
    * 实体的命名空间
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   entityNamespace: string;
 
   /**
    * 实体名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   entityName: string;
 
   /**
    * 别名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   asName: string;
 
   /**
    * joinType
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   joinType: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL';
 
   /**
@@ -474,7 +466,7 @@ export class QueryJoinExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const simpleEntityKey = this.entityName + 'Entity';
+    const simpleEntityKey = this.entityKey + 'Entity';
     let code = `.${this.joinType}_JOIN(${simpleEntityKey}, ${this.asName || this.entityName} => ON(() => `;
     this.onExpressions.forEach((on) => {
       code += on.toNaturalTS(shiftState(state, code, { inline: true }));
@@ -483,7 +475,7 @@ export class QueryJoinExpression extends LogicItem {
 
     if (this.joinParts.length) {
       this.joinParts.forEach((joinPart) => {
-        code += '\n';
+        code += `\n${indent(state.tabSize)}`;
         code += joinPart.toNaturalTS(state);
       });
     }
@@ -494,8 +486,7 @@ export class QueryJoinExpression extends LogicItem {
   @withSourceMap()
   toNaturalSQL(state = createCompilerState()): string {
     let code = `${this.joinType} JOIN ${this.entityKey}`;
-    if (this.asName)
-      code += ` AS ${this.asName}`;
+    if (this.asName) code += ` AS ${this.asName}`;
     code += ' ON ';
     this.onExpressions.forEach((on) => {
       code += on.toNaturalSQL(shiftState(state, code, { inline: true }));

package/src/concepts/QueryLimitExpression__.ts

@@ -126,15 +126,27 @@ export class QueryLimitExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalSQL(state = createCompilerState()): string {
-    let pageElement = this.pageElement.concept === 'Identifier' ? `\${${this.pageElement.toNaturalSQL(state)}}` : this.pageElement.toNaturalSQL(state);
-    let pageSizeElement = this.pageSizeElement.concept === 'Identifier' ? `\${${this.pageSizeElement.toNaturalSQL(state)}}` : this.pageSizeElement.toNaturalSQL(state);
+    let pageElement =
+      this.pageElement.concept === 'Identifier'
+        ? `\${${this.pageElement.toNaturalSQL(state)}}`
+        : this.pageElement.toNaturalSQL(state);
+    let pageSizeElement =
+      this.pageSizeElement.concept === 'Identifier'
+        ? `\${${this.pageSizeElement.toNaturalSQL(state)}}`
+        : this.pageSizeElement.toNaturalSQL(state);
     return `${pageElement}, ${pageSizeElement}`;
   }
 
   @withSourceMap()
   toTextualNASL(state = createCompilerState()): string {
-    let pageElement = this.pageElement.concept === 'Identifier' ? `\${${this.pageElement.toTextualNASL(state)}}` : this.pageElement.toTextualNASL(state);
-    let pageSizeElement = this.pageSizeElement.concept === 'Identifier' ? `\${${this.pageSizeElement.toTextualNASL(state)}}` : this.pageSizeElement.toTextualNASL(state);
+    let pageElement =
+      this.pageElement.concept === 'Identifier'
+        ? `\${${this.pageElement.toTextualNASL(state)}}`
+        : this.pageElement.toTextualNASL(state);
+    let pageSizeElement =
+      this.pageSizeElement.concept === 'Identifier'
+        ? `\${${this.pageSizeElement.toTextualNASL(state)}}`
+        : this.pageSizeElement.toTextualNASL(state);
     return `page ${pageElement} size ${pageSizeElement}`;
   }
 

package/src/concepts/QueryOrderByExpression__.ts

@@ -137,30 +137,39 @@ export class QueryOrderByExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let orderElement = this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
-      ? (this.orderElement as Identifier).name
-      : this.orderElement.toNaturalTS(state);
+    let orderElement =
+      this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
+        ? (this.orderElement as Identifier).name
+        : this.orderElement.toNaturalTS(state);
     let order = this.order.toNaturalTS(state);
     return `[${orderElement || '__IDENTIFIER__'}, ${order || '__IDENTIFIER__'}]`;
   }
 
   @withSourceMap()
   toNaturalSQL(state = createCompilerState()): string {
-    let orderElement = this.orderElement.concept === 'QueryOrderByExpression' 
-      ? this.orderElement.toTextualNASL(state)
-      : this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
-      ? (this.orderElement as Identifier).name
-      : `\${${this.orderElement.toTextualNASL(state)}}`;
-    let order = this.order.concept === 'StringLiteral' ? (this.order as StringLiteral).value : `\${${this.order.toTextualNASL(state)}}`;
+    let orderElement =
+      this.orderElement.concept === 'QueryOrderByExpression'
+        ? this.orderElement.toTextualNASL(state)
+        : this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
+        ? (this.orderElement as Identifier).name
+        : `\${${this.orderElement.toTextualNASL(state)}}`;
+    let order =
+      this.order.concept === 'StringLiteral'
+        ? (this.order as StringLiteral).value
+        : `\${${this.order.toTextualNASL(state)}}`;
     return `${orderElement || '__IDENTIFIER__'} ${order || '__IDENTIFIER__'}`;
   }
 
   @withSourceMap()
   toTextualNASL(state = createCompilerState()): string {
-    let orderElement = this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
-      ? (this.orderElement as Identifier).name
-      : this.orderElement.toNaturalSQL(state);
-    let order = this.order.concept === 'StringLiteral' ? (this.order as StringLiteral).value.toLowerCase() : `\${${this.order.toTextualNASL(state)}}`;
+    let orderElement =
+      this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
+        ? (this.orderElement as Identifier).name
+        : this.orderElement.toNaturalSQL(state);
+    let order =
+      this.order.concept === 'StringLiteral'
+        ? (this.order as StringLiteral).value.toLowerCase()
+        : `\${${this.order.toTextualNASL(state)}}`;
     return `${orderElement || '__IDENTIFIER__'} ${order || '__IDENTIFIER__'}`;
   }
 

package/src/concepts/QuerySelectExpression__.ts

@@ -48,17 +48,13 @@ export class QuerySelectExpression extends LogicItem {
   /**
    * distinct
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   distinct: boolean = false;
 
   /**
    * star
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   star: boolean = true;
 
   /**
@@ -511,7 +507,9 @@ export class QuerySelectExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = this.distinct ? `\n${indent(state.tabSize)}.SELECT_DISTINCT(() => ({\n` : `\n${indent(state.tabSize)}.SELECT(() => ({\n`;
+    let code = this.distinct
+      ? `\n${indent(state.tabSize)}.SELECT_DISTINCT(() => ({\n`
+      : `\n${indent(state.tabSize)}.SELECT(() => ({\n`;
 
     this.selectElements.forEach((element) => {
       code += indent(state.tabSize + 1);
@@ -534,20 +532,17 @@ export class QuerySelectExpression extends LogicItem {
   @withSourceMap()
   toNaturalSQL(state = createCompilerState()): string {
     let code = 'SELECT ';
-    if (this.distinct)
-      code += 'DISTINCT ';
+    if (this.distinct) code += 'DISTINCT ';
 
     this.selectElements.forEach((element) => {
       code += element.toNaturalSQL(state);
-      if (element !== this.selectElements[this.selectElements.length - 1])
-        code += ', ';
+      if (element !== this.selectElements[this.selectElements.length - 1]) code += ', ';
     });
 
     if ((this.parentNode as CallQueryComponent)?.groupBy.length) {
       (this.parentNode as CallQueryComponent)?.groupBy.forEach((element, index) => {
         code += element.toNaturalSQL(state);
-        if (element !== (this.parentNode as CallQueryComponent)?.groupBy[this.selectElements.length - 1])
-          code += ', ';
+        if (element !== (this.parentNode as CallQueryComponent)?.groupBy[this.selectElements.length - 1]) code += ', ';
       });
     }
 

package/src/concepts/Rect__.ts

@@ -35,33 +35,25 @@ export class Rect extends BaseNode {
   /**
    * x
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   x: number;
 
   /**
    * y
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   y: number;
 
   /**
    * width
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   width: number;
 
   /**
    * height
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   height: number;
 
   /**

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

@@ -9,6 +9,7 @@ import {
   TranslatorGenerator,
   indent,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 
 interface defaultCode {
@@ -56,26 +57,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 +78,7 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 默认值
@@ -91,15 +86,13 @@ export class StructureProperty extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue: DefaultValue;
+  defaultValue?: DefaultValue;
 
   /**
    * 数据结构字段 JSON 的序列化别名
    */
-  @property({
-    objectRef: '',
-  })
-  jsonName: string;
+  @property()
+  jsonName?: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -210,7 +203,11 @@ export class StructureProperty extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = this.name;
+    let code = '';
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['label', 'description']);
+    
+    code += this.name;
     if (this.typeAnnotation) {
       code += ': ';
       code += this.typeAnnotation.toNaturalTS(shiftState(state, code, { inline: true }));
@@ -294,7 +291,7 @@ export class StructureProperty extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || (this.parentNode as Structure).origin === 'CallQueryComponent' || this.isConnector;
+    return !!this.module || this.isConnector;
   }
 
   //================================================================================