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

package/src/concepts/FrontendType__.ts

@@ -43,17 +43,13 @@ export class FrontendType extends BaseNode {
   /**
    * 名称与type保持一致
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: 'pc' | 'h5';
 
   /**
    * PC/H5 端
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   kind: 'pc' | 'h5';
 
   /**
@@ -86,14 +82,6 @@ export class FrontendType extends BaseNode {
   })
   componentDependencies: Array<Module> = [];
 
-  /**
-   * 框架语言标识
-   */
-  @property({
-    objectRef: '',
-  })
-  frameworkKind: 'vue2' | 'react' = 'vue2';
-
   /**
    * @param source 需要合并的部分参数
    */

package/src/concepts/FrontendVariable__.ts

@@ -40,9 +40,7 @@ export class FrontendVariable extends Variable {
   /**
    * 是否开启本地缓存
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   localCache: boolean = false;
 
   /**

package/src/concepts/Frontend__.ts

@@ -56,49 +56,37 @@ export class Frontend extends BaseNode {
   /**
    * 前端标识
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * pc端
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * PC/H5 端
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: 'pc' | 'h5';
 
   /**
    * 基础路径
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   path: string;
 
   /**
    * 制品应用标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   documentTitle: string;
 
   /**
    * 制品应用图标
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   documentIcon: string;
 
   /**
@@ -142,17 +130,13 @@ export class Frontend extends BaseNode {
   /**
    * 全局缩放开关
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   globalScaleEnabled: boolean = false;
 
   /**
    * 画布宽度
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   canvasWidth: number = 0;
 
   /**
@@ -902,14 +886,6 @@ export class Frontend extends BaseNode {
     };
   }
 
-  get frameworkKind(): FrontendType['frameworkKind']{
-    const node = this.getAncestor('FrontendType');
-    if(asserts.isFrontendType(node)){
-      return node.frameworkKind ?? 'vue2';
-    }
-    return 'vue2';
-  }
-
   getPath() {
     const { path } = this;
     const finalPath = path && path !== '/' ? path : '';
@@ -1080,8 +1056,8 @@ export class Frontend extends BaseNode {
             i18nKey: createUUID(),
           });
         }
-      })
-    })
+      });
+    });
     this.app?.emit('collect:end');
   }
 
@@ -1111,7 +1087,7 @@ export class Frontend extends BaseNode {
     const allEnums = [...this.app.enums];
     this.app?.dependencies.forEach((item) => {
       allEnums.push(...item.enums);
-    })
+    });
     allEnums.forEach((item) => {
       item.enumItems.forEach((item) => {
         if (item?.label?.i18nKey) {

package/src/concepts/Function__.ts

@@ -56,17 +56,13 @@ export class Function extends BaseNode {
   /**
    * 函数名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 函数描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**

package/src/concepts/HistoryProcessV2__.ts

@@ -41,25 +41,19 @@ export class HistoryProcessV2 extends BaseNode {
   /**
    * 流程名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 流程标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 流程描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -75,9 +69,7 @@ export class HistoryProcessV2 extends BaseNode {
   /**
    * 流程版本
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   version: number;
 
   /**

package/src/concepts/I18nInfo__.ts

@@ -1,7 +1,4 @@
-import {
-  withSourceMap,
-  createCompilerState,
-} from '../translator';
+import { withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -39,24 +36,20 @@ export class I18nInfo extends BaseNode {
   /**
    * 是否开启
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   enabled: boolean;
 
   /**
    * locale
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   locale: string;
 
   /**
    * 国际化配置列表
    */
   @property()
-  messageMap!: Map<String, Map<String, String>>;
+  messageMap: Record<string, Record<string, string>>;
 
   /**
    * @param source 需要合并的部分参数
@@ -95,15 +88,15 @@ export class I18nInfo extends BaseNode {
     });
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     return '';
   }
 
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
   get messagesLanguageList() {
     return Object.keys(this.messageMap || {});
   }

package/src/concepts/IconSetter__.ts

@@ -36,10 +36,8 @@ export class IconSetter extends BaseSetter {
   /**
    * 图标标题
    */
-  @property({
-    objectRef: '',
-  })
-  title?: string = null;
+  @property()
+  title?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/Identifier__.ts

@@ -53,17 +53,13 @@ export class Identifier extends LogicItem {
   /**
    * 命名空间
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   namespace: string;
 
   /**
    * 标识符名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
@@ -282,7 +278,7 @@ export class Identifier extends LogicItem {
         // 业务组件需要特殊处理
         if (this.businessComponent && ['BusinessLogic'].includes(findLogic.concept)) {
           if (state?.inElementsRefTree) {
-            code +=  `__${this.businessComponent.name}.__`;
+            code += `__${this.businessComponent.name}.__`;
           } else {
             code += `(this as ${this.businessComponent.name}).`;
           }
@@ -330,12 +326,15 @@ export class Identifier extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    if (this.name === undefined)
-      console.log(this.toJSON(), this.parentNode.toJSON(), this.nodePath)
+    if (this.name === undefined) console.log(this.toJSON(), this.parentNode.toJSON(), this.nodePath);
 
     if (this.namespace) {
       const namespace = this.namespace.replace(/^app\.frontendTypes\.(.+?\.)variables\.$/, '$1');
-      const name = Number.isInteger(Number(this.name)) ? `[${this.name}]` : this.name.includes('-') ? `['${this.name}']` : `.${this.name}`;
+      const name = Number.isInteger(Number(this.name))
+        ? `[${this.name}]`
+        : this.name.includes('-')
+        ? `['${this.name}']`
+        : `.${this.name}`;
       return `${namespace}${name}`;
     } else {
       return this.name;

package/src/concepts/ImportedInterface__.ts

@@ -36,10 +36,8 @@ export abstract class ImportedInterface extends AbstractInterface {
   /**
    * exampleMap
    */
-  @property({
-    objectRef: '',
-  })
-  exampleMap: Map<'responseBody' | 'requestBody', string>;
+  @property()
+  exampleMap: Record<'responseBody' | 'requestBody', string>;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/InputSetter__.ts

@@ -36,10 +36,8 @@ export class InputSetter extends BaseSetter {
   /**
    * 占位文本
    */
-  @property({
-    objectRef: '',
-  })
-  placeholder?: string = null;
+  @property()
+  placeholder?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/Integration__.ts

@@ -294,7 +294,6 @@ export class Integration extends BaseNode {
     return ((this.connectors as Connector[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.title);
   }
 
-
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/InterfaceParam__.ts

@@ -59,17 +59,13 @@ export class InterfaceParam extends BaseNode {
   /**
    * 接口参数名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 接口参数描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -83,17 +79,13 @@ export class InterfaceParam extends BaseNode {
   /**
    * 参数位置
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   in: 'query' | 'path' | 'body' | 'header' | 'cookie';
 
   /**
    * 是否必填
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   required: boolean;
 
   /**

package/src/concepts/InterfaceTriggerEvent__.ts

@@ -6,9 +6,9 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
+import { createUUID } from '../utils/create';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
-import { v4 as uuidv4 } from 'uuid';
 
 import AbstractInterface from './AbstractInterface__';
 import TriggerEvent from './TriggerEvent__';

package/src/concepts/Interface__.ts

@@ -62,41 +62,31 @@ export class Interface extends ImportedInterface {
   /**
    * 接口名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 导出的来源
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   originLogicName: string;
 
   /**
    * 接口路径
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   path: string;
 
   /**
    * 接口方法
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 
   /**
    * 接口描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -622,17 +612,17 @@ export class Interface extends ImportedInterface {
     });
     super.delete();
     if (this.originLogicName) {
-      const logic = this.app.logics?.find((logic) => logic.name === this.originLogicName)
+      const logic = this.app.logics?.find((logic) => logic.name === this.originLogicName);
       this.app.naslServer?.embeddedTSEmitter.emit('change', {
         value: [
           {
             originEvent: {
               action: 'update',
               target: logic,
-            }
-          }
-        ]
-      })
+            },
+          },
+        ],
+      });
     }
     this.app?.emit('collect:end');
   }
@@ -1006,7 +996,6 @@ export class Interface extends ImportedInterface {
     return code;
   }
 
-
   getNamespace(): string {
     // 针对 Connector 下的 Interface 需要做额外的兼容处理
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成

package/src/concepts/JSBlock__.ts

@@ -45,9 +45,7 @@ export class JSBlock extends LogicItem {
   /**
    * 代码内容
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**

package/src/concepts/JavaLogic__.ts

@@ -45,25 +45,19 @@ export class JavaLogic extends LogicItem {
   /**
    * 包名
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   packageName: string;
 
   /**
    * className
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   className: string;
 
   /**
    * 代码内容
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**

package/src/concepts/LogicDeclaration__.ts

@@ -38,25 +38,19 @@ export class LogicDeclaration extends BaseNode {
   /**
    * 逻辑名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 逻辑标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 逻辑描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -67,7 +61,7 @@ export class LogicDeclaration extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeParams?: Array<TypeParam> = null;
+  typeParams?: Array<TypeParam>;
 
   /**
    * 输入参数列表

package/src/concepts/LogicItem__.ts

@@ -117,42 +117,32 @@ export abstract class LogicItem extends BaseNode {
   /**
    * 逻辑项标题
    */
-  @property({
-    objectRef: '',
-  })
-  label?: string = null;
+  @property()
+  label?: string;
 
   /**
    * 逻辑项描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * 是否折叠
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   folded?: boolean = false;
 
   /**
    * offsetX
    */
-  @property({
-    objectRef: '',
-  })
-  offsetX?: number = null;
+  @property()
+  offsetX?: number;
 
   /**
    * offsetY
    */
-  @property({
-    objectRef: '',
-  })
-  offsetY?: number = null;
+  @property()
+  offsetY?: number;
 
   /**
    * @param source 需要合并的部分参数