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

package/src/concepts/DataSource__.ts

@@ -51,17 +51,13 @@ export class DataSource extends BaseNode {
   /**
    * 数据源名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 数据源描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -77,9 +73,7 @@ export class DataSource extends BaseNode {
   /**
    * ddl策略
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   ddlStrategy: 'all' | 'originNotTable' | 'none';
 
   /**
@@ -336,9 +330,9 @@ export class DataSource extends BaseNode {
                         typeKind: 'reference',
                         typeNamespace: entityNamespace,
                         typeName: entityName,
-                      })
-                    ]
-                  })
+                      }),
+                    ],
+                  }),
                 });
               }
             });
@@ -500,9 +494,11 @@ export class DataSource extends BaseNode {
   toNaturalTS(state = createCompilerState()): string {
     let code = `namespace app.dataSources.${this.name} {\n`;
     this.entities.forEach((entity, index) => {
-      code += entity.toNaturalTS(shiftState(state, code, {
-        tabSize: state.tabSize + 1,
-      }));
+      code += entity.toNaturalTS(
+        shiftState(state, code, {
+          tabSize: state.tabSize + 1,
+        }),
+      );
       if (index !== this.entities.length - 1) code += '\n';
     });
     code += '}\n';
@@ -513,9 +509,11 @@ export class DataSource extends BaseNode {
   toTextualNASL(state = createCompilerState()): string {
     let code = `dataSource ${this.name} {\n`;
     this.entities.forEach((entity, index) => {
-      code += entity.toTextualNASL(shiftState(state, code, {
-        tabSize: state.tabSize + 1,
-      }));
+      code += entity.toTextualNASL(
+        shiftState(state, code, {
+          tabSize: state.tabSize + 1,
+        }),
+      );
       if (index !== this.entities.length - 1) code += '\n';
     });
     code += '}\n';

package/src/concepts/DatabaseTypeAnnotation__.ts

@@ -36,17 +36,13 @@ export class DatabaseTypeAnnotation extends BaseNode {
   /**
    * 类型名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   typeName: string;
 
   /**
    * 类型参数
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   arguments: Record<string, string>;
 
   /**
@@ -62,6 +58,10 @@ export class DatabaseTypeAnnotation extends BaseNode {
     return super.from(source, parentNode, parentKey) as DatabaseTypeAnnotation;
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     return '';
@@ -74,11 +74,6 @@ export class DatabaseTypeAnnotation extends BaseNode {
     });
     return code;
   }
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
-
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Destination__.ts

@@ -56,17 +56,13 @@ export class Destination extends LogicItem {
   /**
    * viewNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   viewNamespace: string;
 
   /**
    * viewName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   viewName: string;
 
   /**
@@ -82,9 +78,7 @@ export class Destination extends LogicItem {
   /**
    * 目标窗口
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   target: '_self' | '_blank' | '_parent' | '_top' = '_self';
 
   /**

package/src/concepts/EntityIndex__.ts

@@ -50,24 +50,19 @@ export class EntityIndex extends BaseNode {
   /**
    * 实体索引名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 数据库索引名
    */
-  @property({
-    objectRef: '',
-  })
-  indexName: string;
+  @property()
+  indexName?: string;
 
   /**
    * propertyNames
    */
   @property({
-    objectRef: '',
     isArray: true,
     defaultValue: [],
   })
@@ -76,18 +71,14 @@ export class EntityIndex extends BaseNode {
   /**
    * 是否唯一
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   unique: boolean;
 
   /**
    * 实体索引描述
    */
-  @property({
-    objectRef: '',
-  })
-  description: string;
+  @property()
+  description?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/EntityProperty__.ts

@@ -63,41 +63,31 @@ export class EntityProperty extends BaseNode {
   /**
    * 实体属性名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 唯一标识
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   uuid: string = createUUID();
 
   /**
    * 数据库列名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   columnName: string;
 
   /**
    * 实体属性标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   label: string;
 
   /**
    * 实体属性描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -114,15 +104,13 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'DatabaseTypeAnnotation',
   })
-  databaseTypeAnnotation: DatabaseTypeAnnotation;
+  databaseTypeAnnotation?: DatabaseTypeAnnotation;
 
   /**
    * 是否必填
    */
-  @property({
-    objectRef: '',
-  })
-  required: boolean;
+  @property()
+  required?: boolean;
 
   /**
    * 默认值
@@ -130,57 +118,43 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue: DefaultValue;
+  defaultValue?: DefaultValue;
 
   /**
    * 当前属性是否为主键
    */
-  @property({
-    objectRef: '',
-  })
-  primaryKey: boolean;
+  @property()
+  primaryKey?: boolean;
 
   /**
    * 关联实体的命名空间
    */
-  @property({
-    objectRef: '',
-  })
-  relationNamespace: string;
+  @property()
+  relationNamespace?: string;
 
   /**
    * 关联实体
    */
-  @property({
-    objectRef: '',
-  })
-  relationEntity: string;
+  @property()
+  relationEntity?: string;
 
   /**
    * 关联属性
    */
-  @property({
-    objectRef: '',
-  })
-  relationProperty: string;
+  @property()
+  relationProperty?: string;
 
   /**
    * 关联属性实体记录删除规则
    */
-  @property({
-    objectRef: '',
-  })
-  deleteRule: 'protect' | 'cascade';
+  @property()
+  deleteRule?: 'protect' | 'cascade';
 
   /**
    * 显示方式
    */
-  @property({
-    objectRef: '',
-  })
-  display: {
-    [name: string]: boolean;
-  } = {
+  @property()
+  display: Record<string, boolean> = {
     inDetail: true,
     inFilter: true,
     inForm: true,
@@ -191,7 +165,6 @@ export class EntityProperty extends BaseNode {
    * 验证规则
    */
   @property({
-    objectRef: '',
     isArray: true,
     defaultValue: [],
   })
@@ -200,18 +173,14 @@ export class EntityProperty extends BaseNode {
   /**
    * 生成规则
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   generationRule: 'auto' | 'autoIncrement' | 'manual' = 'auto';
 
   /**
    * 表示 Oracle 主键自增时的序列名称
    */
-  @property({
-    objectRef: '',
-  })
-  sequence: string;
+  @property()
+  sequence?: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -528,7 +497,17 @@ export class EntityProperty extends BaseNode {
     const index = (this.parentNode as Entity)?.properties.indexOf(this);
     if (index > 0) code += `\n${indent(state.tabSize)}`;
 
-    code += createDecoratorCode(state, this, ['label', 'description', 'uuid', 'columnName', 'databaseTypeAnnotation', 'required', 'primaryKey', 'generationRule', 'sequence']);
+    code += createDecoratorCode(state, this, [
+      'label',
+      'description',
+      'uuid',
+      'columnName',
+      'databaseTypeAnnotation',
+      'required',
+      'primaryKey',
+      'generationRule',
+      'sequence',
+    ]);
 
     // , 'display'
 

package/src/concepts/Entity__.ts

@@ -56,41 +56,31 @@ export class Entity extends BaseNode {
   /**
    * 实体名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 唯一标识
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   uuid: string = createUUID();
 
   /**
    * 数据库表名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   tableName: string;
 
   /**
    * 实体描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
    * 实体来源
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   origin: 'ide' | 'sql' | 'table' | 'excel' = 'ide';
 
   /**
@@ -515,10 +505,10 @@ export class Entity extends BaseNode {
     return this.getAncestor('DataSource') as DataSource;
   }
 
-    /**
+  /**
    * 绑定的流程表单页面
    */
-  __bindView: Map<string,View> = null;
+  __bindView: Map<string, View> = null;
 
   getPropertyExistingColumnNames(excludedList: Array<EntityProperty> = []) {
     const excludedSet = new Set(excludedList);

package/src/concepts/EnumItem__.ts

@@ -24,7 +24,7 @@ import { createUUID } from '../utils/create';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import BaseNode from '../common/BaseNode';
-import type StaticString from './StaticString__';
+import StaticString from './StaticString__';
 
 /**
  * 枚举值
@@ -50,9 +50,7 @@ export class EnumItem extends BaseNode {
   /**
    * 枚举值的值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**
@@ -61,7 +59,7 @@ export class EnumItem extends BaseNode {
   @property({
     objectRef: 'StaticString',
   })
-  label!: StaticString;
+  label: StaticString;
 
   /**
    * @param source 需要合并的部分参数
@@ -103,6 +101,10 @@ export class EnumItem extends BaseNode {
     });
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
   /**
    * 删除静态字符串
    * @param name 静态字符串名称
@@ -159,10 +161,6 @@ export class EnumItem extends BaseNode {
     return params;
   }
 
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
   /**
    * 祖先 Enum
    */

package/src/concepts/Enum__.ts

@@ -53,25 +53,19 @@ export class Enum extends BaseNode {
   /**
    * 枚举名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 枚举标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   label: string;
 
   /**
    * 枚举描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**

package/src/concepts/EventDeclaration__.ts

@@ -35,33 +35,25 @@ export class EventDeclaration 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;
 
   /**

package/src/concepts/Event__.ts

@@ -55,41 +55,31 @@ export class Event extends BaseNode {
   /**
    * 组件事件名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 组件事件分组
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   group: string;
 
   /**
    * 组件事件标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 组件事件描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
    * 是否为高级功能，不在低代码中显示
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   advanced: boolean;
 
   /**

package/src/concepts/ExternalDestination__.ts

@@ -60,9 +60,7 @@ export class ExternalDestination extends LogicItem {
   /**
    * 目标窗口
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   target: '_self' | '_blank' | '_parent' | '_top' = '_self';
 
   /**
@@ -71,7 +69,7 @@ export class ExternalDestination extends LogicItem {
   @property({
     objectRef: 'Anchor',
   })
-  anchor: Anchor;
+  anchor?: Anchor;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/FieldPermissionV2__.ts

@@ -44,17 +44,13 @@ export class FieldPermissionV2 extends BaseNode {
   /**
    * 实体属性名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   propertyName: string;
 
   /**
    * 字段控制详情
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   permission: 'hidden' | 'readOnly' | 'editable';
 
   /**

package/src/concepts/FlowConditionV2__.ts

@@ -45,9 +45,7 @@ export class FlowConditionV2 extends BaseNode {
   /**
    * 生效策略
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   quantifier: 'all' | 'any';
 
   /**

package/src/concepts/ForEachStatement__.ts

@@ -86,7 +86,7 @@ export class ForEachStatement extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  end: LogicItem;
+  end?: LogicItem;
 
   /**
    * 循环体

package/src/concepts/FrontendLibrary__.ts

@@ -40,17 +40,13 @@ export class FrontendLibrary extends BaseNode {
   /**
    * 名称与type保持一致
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: 'pc' | 'h5' = 'pc';
 
   /**
    * PC/H5 端
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: 'pc' | 'h5';
 
   /**