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

package/src/concepts/CallLogic__.ts

@@ -16,7 +16,12 @@ import type Param from './Param__';
 import type View from './View__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import { findConceptKeyWordIndexFromNamespace } from '../utils';
-import { getBusinessComponentCallExpressionQuickInfo, getCallExpressionQuickInfo, GetCode, Range } from './utils/quick-info';
+import {
+  getBusinessComponentCallExpressionQuickInfo,
+  getCallExpressionQuickInfo,
+  GetCode,
+  Range,
+} from './utils/quick-info';
 import type { ViewElement, ElementToVueOptions } from './ViewElement__';
 import type { MemberExpression } from './MemberExpression__';
 import type { StringLiteral } from './StringLiteral__';
@@ -62,42 +67,32 @@ export class CallLogic extends LogicItem {
   /**
    * 唯一标识
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   uuid: string = createUUID();
 
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeName: string;
 
   /**
    * shortcut
    */
-  @property({
-    objectRef: '',
-  })
-  shortcut: boolean;
+  @property()
+  shortcut?: boolean;
 
   /**
    * handleError
    */
-  @property({
-    objectRef: '',
-  })
-  handleError: boolean;
+  @property()
+  handleError?: boolean;
 
   /**
    * 类型参数
@@ -107,7 +102,7 @@ export class CallLogic extends LogicItem {
     isArray: true,
     defaultValue: null,
   })
-  typeArguments?: Array<TypeAnnotation> = null;
+  typeArguments?: Array<TypeAnnotation>;
 
   /**
    * 实际参数
@@ -125,15 +120,13 @@ export class CallLogic extends LogicItem {
   @property({
     objectRef: 'BindAttribute',
   })
-  validation: BindAttribute;
+  validation?: BindAttribute;
 
   /**
    * 是否被折叠
    */
-  @property({
-    objectRef: '',
-  })
-  isAdvancedSettingFolded: boolean;
+  @property()
+  isAdvancedSettingFolded?: boolean;
 
   /**
    * @param source 需要合并的部分参数
@@ -662,19 +655,19 @@ export class CallLogic extends LogicItem {
 
       if (['data-source', 'dataSource'].includes(bindAttr?.name)) {
         const currentElement = this.getAncestor('ViewElement') as ViewElement;
-          let currentIndex = 0
-          let targetElement = currentElement.parentNode
-          const currentParamList: string[] = []
-          while(asserts.isViewElement(targetElement)) {
-            if (targetElement.tag === 'template' && targetElement.haveScope()) {
-              currentIndex += 1
-            }
-            targetElement = targetElement.parentNode
+        let currentIndex = 0;
+        let targetElement = currentElement.parentNode;
+        const currentParamList: string[] = [];
+        while (asserts.isViewElement(targetElement)) {
+          if (targetElement.tag === 'template' && targetElement.haveScope()) {
+            currentIndex += 1;
           }
-          for (let i = 0; i < currentIndex; i++) {
-            currentParamList.push(`,current${i === 0 ? '' : i}`)
-          }
-          code += `(params)=>__${currentElement.name}_handleDataSourceLoad(params${currentParamList.join('')})`;
+          targetElement = targetElement.parentNode;
+        }
+        for (let i = 0; i < currentIndex; i++) {
+          currentParamList.push(`,current${i === 0 ? '' : i}`);
+        }
+        code += `(params)=>__${currentElement.name}_handleDataSourceLoad(params${currentParamList.join('')})`;
         return code;
       }
       if (calleeName === 'jsonSerialize') {
@@ -1135,7 +1128,9 @@ export class CallLogic extends LogicItem {
   get isSpecificProcessLogic() {
     return (
       this.calleeNamespace === 'nasl.processV2' &&
-      ['launchProcess', 'transferTask', 'submitTask', 'rejectTask', 'approveTask', 'getTaskData'].includes(this.calleeName)
+      ['launchProcess', 'transferTask', 'submitTask', 'rejectTask', 'approveTask', 'getTaskData'].includes(
+        this.calleeName,
+      )
     );
   }
 
@@ -1453,8 +1448,7 @@ export class CallLogic extends LogicItem {
           } else {
             // 页面逻辑先都非必填
             let argStr = arg.toTextualNASL(shiftState(state, code, { tabSize: 0 }), paramRequired);
-            if (argStr.startsWith('elements.$ce.'))
-              argStr = argStr.replace('elements.$ce.', '$currentElement.');
+            if (argStr.startsWith('elements.$ce.')) argStr = argStr.replace('elements.$ce.', '$currentElement.');
             code += argStr;
           }
           if (index !== logicArgs.length - 1) code += ', ';
@@ -1468,8 +1462,7 @@ export class CallLogic extends LogicItem {
           } else {
             // 取到是不是必填放入参数中
             let argStr = arg.toTextualNASL(shiftState(state, code, { tabSize: 0 }), arg?.paramRequired);
-            if (argStr.startsWith('elements.$ce.'))
-              argStr = argStr.replace('elements.$ce.', '$currentElement.');
+            if (argStr.startsWith('elements.$ce.')) argStr = argStr.replace('elements.$ce.', '$currentElement.');
             code += argStr;
           }
           if (index !== logicArgs.length - 1) code += ', ';
@@ -1538,7 +1531,8 @@ export class CallLogic extends LogicItem {
         line: range.start.line + lineOffset + 1,
         offset: characterOffset,
       };
-    } else if (this.getAncestor('BusinessComponent')) { // 怕改坏其他地方，业务组件单独处理
+    } else if (this.getAncestor('BusinessComponent')) {
+      // 怕改坏其他地方，业务组件单独处理
       return getBusinessComponentCallExpressionQuickInfo(range, getCode);
     } else {
       return getCallExpressionQuickInfo(range, getCode);
@@ -1563,8 +1557,7 @@ export class CallLogic extends LogicItem {
     const logicParams = node?.params ?? [];
 
     callArguments.forEach((arg, index) => {
-      if (!arg)
-        return;
+      if (!arg) return;
       const param = logicParams[index] || ({} as Param);
       arg.paramRequired = Boolean(!param?.defaultValue?.expression);
       arg.paramTypeAnnotation = undefined;

package/src/concepts/CallQueryComponent__.ts

@@ -64,7 +64,7 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation: TypeAnnotation;
+  typeAnnotation?: TypeAnnotation;
 
   /**
    * select
@@ -116,7 +116,7 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  having: LogicItem;
+  having?: LogicItem;
 
   /**
    * having 草稿态
@@ -149,9 +149,7 @@ export class CallQueryComponent extends LogicItem {
   /**
    * 查询组件的局部版本
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   ideVersion: string;
 
   /**
@@ -774,7 +772,7 @@ export class CallQueryComponent extends LogicItem {
     };
   }
 
-  *toEmbeddedTSOfSubPart<T extends { toEmbeddedTS: (state?: TranslatorState) => TranslatorGenerator; }>(
+  *toEmbeddedTSOfSubPart<T extends { toEmbeddedTS: (state?: TranslatorState) => TranslatorGenerator }>(
     key: string,
     list: Array<T>,
     options: {
@@ -1199,15 +1197,7 @@ export class CallQueryComponent extends LogicItem {
             // 2.1.1. `COUNT`、`COUNTD` 返回 `Long`
             typeName = 'Long';
           } else if (['AVG'].includes(selectElements[0].aggregateName)) {
-            const { entityAsName, propertyName } = selectElements[0].aggregateParam;
-            const entity = entities.find((item: Entity) => item.name === entityAsName);
-            const property = entity?.properties.find((item: any) => item.name === propertyName);
-            const propertyTypeName = property?.typeAnnotation?.typeName;
-            if (propertyTypeName === 'Decimal') {
-              typeName = 'Decimal';
-            } else {
-              typeName = 'Double';
-            }
+            typeName = 'Decimal';
           } else {
             // 2.1.3. 其他返回列类型，包含：`Long`、`Long`、`Double`
             const { entityAsName, propertyName } = selectElements[0].aggregateParam;
@@ -1328,7 +1318,7 @@ export class CallQueryComponent extends LogicItem {
           }
         }
       }
-    } catch { }
+    } catch {}
   }
 
   getEntityInfos(node: QueryFromExpression | QueryJoinExpression, set = new Set()) {
@@ -1563,8 +1553,7 @@ export class CallQueryComponent extends LogicItem {
     code += ' ';
     code += this.from.toNaturalSQL(shiftState(state, code, { inline: true }));
 
-    if (this.where)
-      code += '\nWHERE ' + this.where.toNaturalSQL(shiftState(state, code, { inline: true }));
+    if (this.where) code += '\nWHERE ' + this.where.toNaturalSQL(shiftState(state, code, { inline: true }));
     if (this.groupBy.length) {
       code += '\nGROUP BY ';
       this.groupBy.forEach((groupExpression, index) => {
@@ -1572,8 +1561,7 @@ export class CallQueryComponent extends LogicItem {
         if (index !== this.groupBy.length - 1) code += ', ';
       });
     }
-    if (this.having)
-      code += '\nHAVING ' + this.having.toNaturalSQL(shiftState(state, code, { inline: true }));
+    if (this.having) code += '\nHAVING ' + this.having.toNaturalSQL(shiftState(state, code, { inline: true }));
     if (this.orderBy.length) {
       code += '\nORDER BY ';
       this.orderBy.forEach((orderExpression, index) => {
@@ -1581,8 +1569,7 @@ export class CallQueryComponent extends LogicItem {
         if (index !== this.orderBy.length - 1) code += ', ';
       });
     }
-    if (this.limit)
-      code += '\nLIMIT ' + this.limit.toNaturalSQL(shiftState(state, code, { inline: true }));
+    if (this.limit) code += '\nLIMIT ' + this.limit.toNaturalSQL(shiftState(state, code, { inline: true }));
 
     return code;
   }

package/src/concepts/Comment__.ts

@@ -47,9 +47,7 @@ export class Comment extends LogicItem {
   /**
    * 注释内容
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**

package/src/concepts/CompletionProperty__.ts

@@ -37,33 +37,25 @@ export class CompletionProperty extends BaseNode {
   /**
    * 自动补全属性名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 自动补全属性的值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**
    * 自动补全属性标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   label: string;
 
   /**
    * 自动补全属性描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -77,9 +69,7 @@ export class CompletionProperty extends BaseNode {
   /**
    * 默认值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   defaultValue: string;
 
   /**

package/src/concepts/ConfigGroup__.ts

@@ -1,7 +1,4 @@
-import {
-  withSourceMap,
-  createCompilerState,
-} from '../translator';
+import { withSourceMap, createCompilerState } from '../translator';
 import Namespace from './Namespace__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -41,9 +38,7 @@ export class ConfigGroup extends BaseNode {
   /**
    * 配置组名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**

package/src/concepts/ConfigPropertyValue__.ts

@@ -1,7 +1,4 @@
-import {
-  withSourceMap,
-  createCompilerState,
-} from '../translator';
+import { withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -39,17 +36,13 @@ export class ConfigPropertyValue extends BaseNode {
   /**
    * env
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   env: string;
 
   /**
    * 配置属性值的值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**
@@ -89,11 +82,6 @@ export class ConfigPropertyValue extends BaseNode {
     });
   }
 
-  @withSourceMap()
-  toNaturalTS(state = createCompilerState()): string {
-    return '';
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/ConfigProperty__.ts

@@ -52,17 +52,13 @@ export class ConfigProperty extends BaseNode {
   /**
    * 配置属性名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 配置属性描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -78,9 +74,7 @@ export class ConfigProperty extends BaseNode {
   /**
    * isPrivate
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   isPrivate: boolean;
 
   /**

package/src/concepts/Configuration__.ts

@@ -1,7 +1,4 @@
-import {
-  withSourceMap,
-  createCompilerState,
-} from '../translator';
+import { withSourceMap, createCompilerState } from '../translator';
 import type App from './App__';
 import ConfigProperty from './ConfigProperty__';
 //================================================================================

package/src/concepts/Connection__.ts

@@ -51,25 +51,19 @@ export class Connection extends BaseNode {
   /**
    * namespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   namespace: string;
 
   /**
    * 连接名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 连接标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**

package/src/concepts/ConnectorLogic__.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 Logic from './Logic__';
 
@@ -36,9 +36,7 @@ export class ConnectorLogic extends Logic {
   /**
    * 模式类型
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   kind: 'http' | 'pipeline';
 
   /**

package/src/concepts/ConnectorTriggerLauncher__.ts

@@ -7,9 +7,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 TriggerLauncher from './TriggerLauncher__';
 
@@ -37,17 +37,13 @@ export class ConnectorTriggerLauncher extends TriggerLauncher {
   /**
    * calleeConnectionName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeConnectionName: string;
 
   /**
    * 连接器触发器启动器标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
@@ -93,16 +89,22 @@ export class ConnectorTriggerLauncher extends TriggerLauncher {
   //================================================================================
 
   get connector() {
-    const connectorName = this.calleeNamespace.split('.')?.[1]
-    return (this.getAncestor('App') as App)?.connectorDependencies?.find(connector => connector.name === connectorName);
+    const connectorName = this.calleeNamespace.split('.')?.[1];
+    return (this.getAncestor('App') as App)?.connectorDependencies?.find(
+      (connector) => connector.name === connectorName,
+    );
   }
 
   get connection() {
-    return (this.getAncestor('App') as App)?.connections?.find(connection => connection.namespace === this.calleeNamespace && connection.name === (this as ConnectorTriggerLauncher).calleeConnectionName)
+    return (this.getAncestor('App') as App)?.connections?.find(
+      (connection) =>
+        connection.namespace === this.calleeNamespace &&
+        connection.name === (this as ConnectorTriggerLauncher).calleeConnectionName,
+    );
   }
 
   get connectorTrigger() {
-    return this.connector?.triggers?.find(trigger => trigger.name === this.calleeName)
+    return this.connector?.triggers?.find((trigger) => trigger.name === this.calleeName);
   }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/ConnectorTrigger__.ts

@@ -56,17 +56,13 @@ export class ConnectorTrigger extends BaseNode {
   /**
    * 连接器触发器名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 连接器触发器标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string = '';
 
   /**
@@ -213,22 +209,26 @@ export class ConnectorTrigger extends BaseNode {
     let code = '';
     code += `export function ${self.tsName} () {\n`;
     try {
-      code += `let params:`
+      code += `let params:`;
       if (this?.triggerEvent?.callBackLogic?.typeArguments?.[0]) {
-        code +=  `${yield* this?.triggerEvent?.callBackLogic?.typeArguments?.[0]?.toEmbeddedTS?.(shiftState(state, code))}\n`
+        code += `${yield* this?.triggerEvent?.callBackLogic?.typeArguments?.[0]?.toEmbeddedTS?.(
+          shiftState(state, code),
+        )}\n`;
       } else {
-        code += 'undefined;\n'
+        code += 'undefined;\n';
       }
       code += `let result:`;
       if (this?.triggerEvent?.callBackLogic?.returnType?.[0]) {
-        code += `${yield* this?.triggerEvent?.callBackLogic?.returnType?.[0]?.toEmbeddedTS?.(shiftState(state, code))}\n`
+        code += `${yield* this?.triggerEvent?.callBackLogic?.returnType?.[0]?.toEmbeddedTS?.(
+          shiftState(state, code),
+        )}\n`;
       } else {
-        code += 'void;\n'
+        code += 'void;\n';
       }
       code += `return {
         params,
         result
-      }\n`
+      }\n`;
       // code += ';\n';
       code += '}\n';
     } catch (error) {

package/src/concepts/Connector__.ts

@@ -46,9 +46,7 @@ export class Connector extends Module {
   /**
    * connectorKind
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   connectorKind: string;
 
   /**
@@ -90,9 +88,7 @@ export class Connector extends Module {
   /**
    * 预览图
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   previewImg: string;
 
   /**
@@ -128,9 +124,7 @@ export class Connector extends Module {
   /**
    * isLocal
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   isLocal: boolean = true;
 
   /**

package/src/concepts/Constant__.ts

@@ -55,17 +55,13 @@ export class Constant extends BaseNode {
   /**
    * 常量名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 常量描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**

package/src/concepts/CountersignPolicyV2__.ts

@@ -36,9 +36,7 @@ export class CountersignPolicyV2 extends ApprovalPolicyV2 {
   /**
    * 通过百分比
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   passPercent: number;
 
   /**

package/src/concepts/CountersignPolicy__.ts

@@ -36,9 +36,7 @@ export class CountersignPolicy extends MultiApprovalPolicy {
   /**
    * 通过百分比
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   passPercent: number;
 
   /**