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

package/src/concepts/ProcessV2__.ts

@@ -49,33 +49,25 @@ export class ProcessV2 extends BaseNode {
   /**
    * 流程唯一标识
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   uniqueKey: string = createUniqueKey();
 
   /**
    * 流程名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 流程标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 流程描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -91,17 +83,13 @@ export class ProcessV2 extends BaseNode {
   /**
    * 流程版本
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   version: number;
 
   /**
    * 流程状态
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   status: 'designing' | 'enabled';
 
   /**
@@ -863,7 +851,11 @@ export class ProcessV2 extends BaseNode {
     );
     // 流程节点
     yield* wrapForEach([launchLogic, ...processOperates], function* warpForEachGenerator(logic) {
-      code += yield* logic.toEmbeddedDeclarationTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 2 }), null, true);
+      code += yield* logic.toEmbeddedDeclarationTS(
+        shiftState(state, code, { tabSize: (state?.tabSize || 0) + 2 }),
+        null,
+        true,
+      );
     });
     code += `${tab1}}\n`;
 

package/src/concepts/Process__.ts

@@ -59,25 +59,19 @@ export class Process extends BaseNode {
   /**
    * 流程名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 流程标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 流程描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**

package/src/concepts/PropDeclaration__.ts

@@ -37,97 +37,73 @@ export class PropDeclaration extends BaseNode {
   /**
    * 组件属性名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 组件属性标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 组件属性分组
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   group: '基础信息' | '数据属性' | '主要属性' | '交互属性' | '状态属性' | '样式属性' | '工具属性';
 
   /**
    * 组件属性图标
    */
-  @property({
-    objectRef: '',
-  })
-  icon?: string = null;
+  @property()
+  icon?: string;
 
   /**
    * 组件属性描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * 类型
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   tsType: string;
 
   /**
    * 是否支持双向绑定
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   sync: boolean;
 
   /**
    * 工具提示链接
    */
-  @property({
-    objectRef: '',
-  })
-  tooltipLink?: string = null;
+  @property()
+  tooltipLink?: string;
 
   /**
    * 文档描述
    */
-  @property({
-    objectRef: '',
-  })
-  docDescription?: string = null;
+  @property()
+  docDescription?: string;
 
   /**
    * 隐藏绑定属性按钮
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   bindHide: boolean;
 
   /**
    * 绑定属性并打开弹窗
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   bindOpen: boolean;
 
   /**
    * 所在的 tab 页
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   tabKind: 'property' | 'style';
 
   /**
@@ -138,45 +114,43 @@ export class PropDeclaration extends BaseNode {
   })
   setter: BaseSetter;
 
+  /**
+   * 属性在面板中的布局方式
+   */
+  @property()
+  layout: 'block' | 'inline';
+
   /**
    * 默认值
    */
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue?: DefaultValue = null;
+  defaultValue?: DefaultValue;
 
   /**
    * 渲染时的设计值
    */
-  @property({
-    objectRef: '',
-  })
-  tsDesignerValue?: string = null;
+  @property()
+  tsDesignerValue?: string;
 
   /**
    * 是否显隐
    */
-  @property({
-    objectRef: '',
-  })
-  tsIf?: string = null;
+  @property()
+  tsIf?: string;
 
   /**
    * 是否禁用
    */
-  @property({
-    objectRef: '',
-  })
-  tsDisabledIf?: string = null;
+  @property()
+  tsDisabledIf?: string;
 
   /**
    * 在属性切换时发生的事件
    */
-  @property({
-    objectRef: '',
-  })
-  tsOnChange?: string = null;
+  @property()
+  tsOnChange?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/QueryAggregateExpression__.ts

@@ -46,17 +46,13 @@ export class QueryAggregateExpression extends LogicItem {
   /**
    * 聚合属性别名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   asName: string;
 
   /**
    * 聚合函数名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   aggregateName: 'COUNT' | 'COUNTD' | 'SUM' | 'AVG' | 'MAX' | 'MIN';
 
   /**
@@ -128,8 +124,7 @@ export class QueryAggregateExpression extends LogicItem {
   @withSourceMap()
   toNaturalSQL(state = createCompilerState()): string {
     let code = `${this.aggregateName}(${this.aggregateParam.toTextualNASL(state)})`;
-    if (this.asName)
-      code += ` AS ${this.asName}`;
+    if (this.asName) code += ` AS ${this.asName}`;
 
     return code;
   }

package/src/concepts/QueryFieldExpression__.ts

@@ -47,33 +47,25 @@ export class QueryFieldExpression extends LogicItem {
   /**
    * isDotStar
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   isDotStar: boolean = false;
 
   /**
    * asName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   asName: string;
 
   /**
    * entityAsName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   entityAsName: string;
 
   /**
    * propertyName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   propertyName: string;
 
   /**
@@ -184,14 +176,16 @@ export class QueryFieldExpression extends LogicItem {
 
     if (genAs) {
       if (this.isDotStar)
-        code += `${this.asName || firstLowerCase(this.entityAsName) || '__IDENTIFIER__'}: ${this.entityAsName || '__IDENTIFIER__'}`;
+        code += `${this.asName || firstLowerCase(this.entityAsName) || '__IDENTIFIER__'}: ${
+          this.entityAsName || '__IDENTIFIER__'
+        }`;
       else
-        code += `${this.asName || this.propertyName || '__IDENTIFIER__'}: ${this.entityAsName || '__IDENTIFIER__'}.${this.propertyName || '__IDENTIFIER__'}`;
+        code += `${this.asName || this.propertyName || '__IDENTIFIER__'}: ${this.entityAsName || '__IDENTIFIER__'}.${
+          this.propertyName || '__IDENTIFIER__'
+        }`;
     } else {
-      if (this.isDotStar)
-        code += `${this.entityAsName || '__IDENTIFIER__'}`;
-      else
-        code += `${this.entityAsName || '__IDENTIFIER__'}.${this.propertyName || '__IDENTIFIER__'}`;
+      if (this.isDotStar) code += `${this.entityAsName || '__IDENTIFIER__'}`;
+      else code += `${this.entityAsName || '__IDENTIFIER__'}.${this.propertyName || '__IDENTIFIER__'}`;
     }
 
     return code;
@@ -200,13 +194,10 @@ export class QueryFieldExpression extends LogicItem {
   @withSourceMap()
   toNaturalSQL(state = createCompilerState(), genAs: boolean = false): string {
     let code = '';
-    if (this.isDotStar)
-      code += `${this.entityAsName}.*`;
-    else
-      code += `${this.entityAsName}.${this.propertyName}`;
+    if (this.isDotStar) code += `${this.entityAsName}.*`;
+    else code += `${this.entityAsName}.${this.propertyName}`;
 
-    if (this.asName && genAs)
-      code += ` AS ${this.asName}`;
+    if (this.asName && genAs) code += ` AS ${this.asName}`;
 
     return code;
   }
@@ -221,14 +212,16 @@ export class QueryFieldExpression extends LogicItem {
 
     if (genAs) {
       if (this.isDotStar)
-        code += `${this.asName || firstLowerCase(this.entityAsName) || '__IDENTIFIER__'}: ${this.entityAsName || '__IDENTIFIER__'}`;
+        code += `${this.asName || firstLowerCase(this.entityAsName) || '__IDENTIFIER__'}: ${
+          this.entityAsName || '__IDENTIFIER__'
+        }`;
       else
-        code += `${this.asName || this.propertyName || '__IDENTIFIER__'}: ${this.entityAsName || '__IDENTIFIER__'}.${this.propertyName || '__IDENTIFIER__'}`;
+        code += `${this.asName || this.propertyName || '__IDENTIFIER__'}: ${this.entityAsName || '__IDENTIFIER__'}.${
+          this.propertyName || '__IDENTIFIER__'
+        }`;
     } else {
-      if (this.isDotStar)
-        code += `${this.entityAsName || '__IDENTIFIER__'}`;
-      else
-        code += `${this.entityAsName || '__IDENTIFIER__'}.${this.propertyName || '__IDENTIFIER__'}`;
+      if (this.isDotStar) code += `${this.entityAsName || '__IDENTIFIER__'}`;
+      else code += `${this.entityAsName || '__IDENTIFIER__'}.${this.propertyName || '__IDENTIFIER__'}`;
     }
 
     return code;

package/src/concepts/QueryFromExpression__.ts

@@ -49,25 +49,19 @@ export class QueryFromExpression extends LogicItem {
   /**
    * 实体的命名空间
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   entityNamespace: string;
 
   /**
    * 实体名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   entityName: string;
 
   /**
    * 别名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   asName: string;
 
   /**

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';
 
   /**
@@ -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;
 
   /**