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

package/src/concepts/MicroApp__.ts

@@ -35,57 +35,43 @@ export class MicroApp extends BaseNode {
   /**
    * 微前端框架
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   framework: 'qiankun' | 'icestark';
 
   /**
    * 微应用名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 页面路径前缀
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   routePrefix: string;
 
   /**
    * 接口和静态资源前缀
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   proxyPrefix: string;
 
   /**
    * 登录页面地址
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   loginUrl: string;
 
   /**
    * 无权限页面地址
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   noAuthUrl: string;
 
   /**
    * 404页面地址
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   notFoundUrl: string;
 
   /**

package/src/concepts/Module__.ts

@@ -61,57 +61,43 @@ export class Module extends BaseNode {
   /**
    * type
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: 'extension' | 'interface' | 'component' | 'connector' | 'customInterface';
 
   /**
    * version
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   version: string;
 
   /**
    * 模块名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 模块标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 模块描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
    * provider
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   provider: string;
 
   /**
    * 外部语言依赖
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   externalDependencyMap: {
     maven?: Array<{
       groupId: string;
@@ -123,9 +109,7 @@ export class Module extends BaseNode {
   /**
    * 外部语言依赖
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   compilerInfoMap:
     | {
         java?: Array<{
@@ -133,13 +117,13 @@ export class Module extends BaseNode {
           className: string;
           naslName: string;
           type: string;
-          javaTypes: Map<string, string>;
+          javaTypes: Record<string, string>;
         }>;
         js?: {
           prefix: string;
         };
       }
-    | Map<string, string>;
+    | Record<string, string>;
 
   /**
    * 数据源列表

package/src/concepts/Namespace__.ts

@@ -47,33 +47,25 @@ export class Namespace extends BaseNode {
   /**
    * 表示是从实体还是流程等概念产生的
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   originConcept: string;
 
   /**
    * 命名空间名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 命名空间标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 命名空间描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**

package/src/concepts/NewComposite__.ts

@@ -95,25 +95,19 @@ export class NewComposite extends LogicItem {
   /**
    * hideProperties
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   hideProperties: boolean = false;
 
   /**
    * hideDefaults
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   hideDefaults: boolean = false;
 
   /**
    * 自动连线
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   autoConnection: boolean = true;
 
   /**
@@ -1045,11 +1039,13 @@ export class NewComposite extends LogicItem {
     } else if (typeAnnotation.typeKind !== 'anonymousStructure') {
       // 实体、数据结构默认值使用new时需要改成vue.prototype才能获取到方法
       if (state?.getVuePrototype) {
-        code += `const obj = Vue.prototype.$genInitFromSchema('${typeAnnotation.sortedTypeKey
-          }', Vue.prototype.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
+        code += `const obj = Vue.prototype.$genInitFromSchema('${
+          typeAnnotation.sortedTypeKey
+        }', Vue.prototype.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
       } else {
-        code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey
-          }', this.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
+        code += `const obj = this.$genInitFromSchema('${
+          typeAnnotation.sortedTypeKey
+        }', this.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
       }
       const rightMap = new Map();
       this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
@@ -1114,7 +1110,8 @@ export class NewComposite extends LogicItem {
     if (typeAnnotation) {
       let { typeKind, typeNamespace, typeName, sortedTypeKey } = typeAnnotation;
       if (typeNamespace?.endsWith('.metadataTypes')) {
-        const referenceNode = (this.getAncestor('App') as App).findNodeByCompleteName(typeNamespace + '.' + typeName) || {}
+        const referenceNode =
+          (this.getAncestor('App') as App).findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
         const typeAn = referenceNode.typeAnnotation || {};
         typeKind = typeAn.typeKind;
         typeNamespace = typeAn.typeNamespace;
@@ -1375,14 +1372,19 @@ export class NewComposite extends LogicItem {
 
   @withSourceMap()
   toTextualNASL(state = createCompilerState()): string {
-    let code = this?.typeAnnotation?.typeKind === 'anonymousStructure' ? '' : `${textualNamespace(this?.typeAnnotation?.typeKey)} `;
+    let code =
+      this?.typeAnnotation?.typeKind === 'anonymousStructure'
+        ? ''
+        : `${textualNamespace(this?.typeAnnotation?.typeKey)} `;
 
     let params = '';
     this?.properties?.forEach((item, index) => {
       if (item) {
         const right = this?.rights?.[index]?.expression;
         if (right) {
-          params += `${indent(state.tabSize + 1)}${item?.toTextualNASL()} = ${this?.rights?.[index]?.expression?.toTextualNASL()}`;
+          params += `${indent(state.tabSize + 1)}${item?.toTextualNASL()} = ${this?.rights?.[
+            index
+          ]?.expression?.toTextualNASL()}`;
           // if (index !== this.properties.length - 1) {
           params += ',\n';
           // }

package/src/concepts/NewList__.ts

@@ -54,7 +54,7 @@ export class NewList extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 成员表达式

package/src/concepts/NewMap__.ts

@@ -54,7 +54,7 @@ export class NewMap extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 键
@@ -680,12 +680,17 @@ export class NewMap extends LogicItem {
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
     const typeAnnotation =
-      this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS(shiftState(state, code, { inline: true })))?.join(', ') || '__IDENTIFIER__';
+      this?.typeAnnotation?.typeArguments
+        ?.map((item) => item?.toNaturalTS(shiftState(state, code, { inline: true })))
+        ?.join(', ') || '__IDENTIFIER__';
     let params = '';
     this?.keys?.forEach((item, index) => {
       if (item) {
-        const key = item?.toNaturalTS(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) || '__IDENTIFIER__';
-        params += `${item?.concept.endsWith('Literal') ? key : `[${key}]`}: ${this?.values?.[index]?.toNaturalTS(shiftState(state, code, { inline: true }))}`;
+        const key =
+          item?.toNaturalTS(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) || '__IDENTIFIER__';
+        params += `${item?.concept.endsWith('Literal') ? key : `[${key}]`}: ${this?.values?.[index]?.toNaturalTS(
+          shiftState(state, code, { inline: true }),
+        )}`;
         if (index !== this.keys.length - 1) {
           params += ', ';
         }
@@ -702,8 +707,12 @@ export class NewMap extends LogicItem {
     let paramStr = '';
     this?.keys?.forEach((item, index) => {
       if (item) {
-        const key = item?.toTextualNASL(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) || '__IDENTIFIER__';
-        paramStr += `${item?.concept.endsWith('Literal') ? key : `[${key}]`} -> ${this?.values?.[index]?.toTextualNASL(shiftState(state, code, { inline: true }))}`;
+        const key =
+          item?.toTextualNASL(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 })) ||
+          '__IDENTIFIER__';
+        paramStr += `${item?.concept.endsWith('Literal') ? key : `[${key}]`} -> ${this?.values?.[index]?.toTextualNASL(
+          shiftState(state, code, { inline: true }),
+        )}`;
         if (index !== this.keys.length - 1) {
           paramStr += ', ';
         }

package/src/concepts/NumberInputSetter__.ts

@@ -36,42 +36,32 @@ export class NumberInputSetter extends BaseSetter {
   /**
    * 按钮位置
    */
-  @property({
-    objectRef: '',
-  })
-  placement?: string = null;
+  @property()
+  placement?: string;
 
   /**
    * 最小值
    */
-  @property({
-    objectRef: '',
-  })
-  min?: number = null;
+  @property()
+  min?: number;
 
   /**
    * 最大值
    */
-  @property({
-    objectRef: '',
-  })
-  max?: number = null;
+  @property()
+  max?: number;
 
   /**
    * 精度
    */
-  @property({
-    objectRef: '',
-  })
-  precision?: number = null;
+  @property()
+  precision?: number;
 
   /**
    * 占位文本
    */
-  @property({
-    objectRef: '',
-  })
-  placeholder?: string = null;
+  @property()
+  placeholder?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/NumericLiteral__.ts

@@ -48,9 +48,7 @@ export class NumericLiteral extends LogicItem {
   /**
    * 字面量的值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**

package/src/concepts/OperatePermissionV2__.ts

@@ -44,33 +44,25 @@ export class OperatePermissionV2 extends BaseNode {
   /**
    * 字段名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: 'approve' | 'reject' | 'reassign' | 'revert' | 'submit' | 'withdraw';
 
   /**
    * 是否允许操作
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   operationEnabled: boolean;
 
   /**
    * 操作显示文本
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   displayText: string;
 
   /**
    * 意见是否必填
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   commentRequired: boolean;
 
   /**

package/src/concepts/OqlQueryComponent__.ts

@@ -56,9 +56,7 @@ export class OqlQueryComponent extends LogicItem {
   /**
    * SQL 查询
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**
@@ -67,14 +65,12 @@ export class OqlQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 数据源
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   dataSource: string;
 
   /**

package/src/concepts/OverriddenLogic__.ts

@@ -84,41 +84,31 @@ export class OverriddenLogic extends BaseNode {
   /**
    * 覆写的模块
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   overriddenModule: string;
 
   /**
    * 覆写逻辑名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 覆写逻辑描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
    * 触发方式
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   triggerType: string;
 
   /**
    * 定时任务表达式
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   cron: string;
 
   /**
@@ -137,7 +127,7 @@ export class OverriddenLogic extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeParams?: Array<TypeParam> = null;
+  typeParams?: Array<TypeParam>;
 
   /**
    * 输入参数列表
@@ -1596,14 +1586,13 @@ export class OverriddenLogic extends BaseNode {
     const callFunctionAdvanceMap: Map<Return | Variable, CallFunction> = new Map();
     yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
       if (
-        el && (
-          // 批量赋值
-          asserts.isBatchAssignment(el) ||
+        el &&
+        // 批量赋值
+        (asserts.isBatchAssignment(el) ||
           // 赋值
           (asserts.isAssignment(el) && el.left?.name) ||
           // 内置函数对集合类型的推导
-          (asserts.isCallFunction(el) && el.derivablecollection?.name)
-        )
+          (asserts.isCallFunction(el) && el.derivablecollection?.name))
       ) {
         if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
@@ -1632,7 +1621,7 @@ export class OverriddenLogic extends BaseNode {
               leftIndex.length === 1
                 ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
                 : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-                returnOrigin('');
+                    returnOrigin('');
             const advanceVar = self.variables?.find(
               (variable) => !variable.typeAnnotation && leftCode === variable.name,
             );
@@ -1690,7 +1679,7 @@ export class OverriddenLogic extends BaseNode {
             leftIndex.length === 1
               ? yield* assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
               : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-              returnOrigin('');
+                  returnOrigin('');
           if (leftCode === node.name) {
             const rightNode: any =
               rightIndex.length === 1
@@ -1885,7 +1874,8 @@ export class OverriddenLogic extends BaseNode {
       });
 
       if (!this.body.length || this.body.length === 2) {
-        if (`${this.nodePath}.body[1]` === state.focusedNodePath) code += `${indent(state.tabSize + 1)}/* 当前位置 */\n`;
+        if (`${this.nodePath}.body[1]` === state.focusedNodePath)
+          code += `${indent(state.tabSize + 1)}/* 当前位置 */\n`;
         code += `${indent(state.tabSize + 1)}return ${this.returns[0].name};\n`;
       } else {
         this.body.forEach((item) => {
@@ -1934,7 +1924,7 @@ export class OverriddenLogic extends BaseNode {
     });
     code += ')';
 
-    if(this.returns.length) {
+    if (this.returns.length) {
       code += ' => ';
       this.returns.forEach((ret) => {
         code += ret.toTextualNASL(shiftState(state, code, { inline: true }));

package/src/concepts/ParamWithGroup__.ts

@@ -47,17 +47,13 @@ export class ParamWithGroup extends Param {
   /**
    * 标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 分组
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   group: string;
 
   /**

package/src/concepts/Param__.ts

@@ -71,18 +71,14 @@ export class Param extends BaseNode {
   /**
    * 输入参数名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 输入参数描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * 类型
@@ -90,7 +86,7 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * 默认值
@@ -98,7 +94,7 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue?: DefaultValue = null;
+  defaultValue?: DefaultValue;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/Point__.ts

@@ -35,17 +35,13 @@ export class Point extends BaseNode {
   /**
    * x
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   x: number;
 
   /**
    * y
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   y: number;
 
   /**

package/src/concepts/ProcessBindV2__.ts

@@ -45,17 +45,13 @@ export class ProcessBindV2 extends BaseNode {
   /**
    * 引用数据结构或实体的命名空间
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   refNamespace: string;
 
   /**
    * 引用数据结构或实体的名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   refName: string;
 
   /**