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

package/src/concepts/OverriddenLogic__.ts

@@ -42,8 +42,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type Transactional from './Transactional__';
@@ -63,13 +63,12 @@ import type Process from './Process__';
  * 覆写逻辑
  */
 @concept('覆写逻辑')
-// @ts-ignore
 export class OverriddenLogic extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'OverriddenLogic';
+  static readonly ConceptName: string = 'OverriddenLogic';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -82,35 +81,30 @@ export class OverriddenLogic extends BaseNode {
    * 覆写的模块
    */
   @property()
-  // @ts-ignore
   overriddenModule!: string;
 
   /**
    * 覆写逻辑名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 覆写逻辑描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * 触发方式
    */
   @property()
-  // @ts-ignore
   triggerType!: string;
 
   /**
    * 定时任务表达式
    */
   @property()
-  // @ts-ignore
   cron!: string;
 
   /**
@@ -119,7 +113,6 @@ export class OverriddenLogic extends BaseNode {
   @property({
     objectRef: 'Transactional',
   })
-  // @ts-ignore
   transactional!: Transactional;
 
   /**
@@ -371,7 +364,7 @@ export class OverriddenLogic extends BaseNode {
         this,
         'typeParams',
       );
-    } else if (Assert.isTypeParam(options)) {
+    } else if (asserts.isTypeParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeParam = options;
       Object.assign(typeParam, relationOptions);
@@ -521,7 +514,7 @@ export class OverriddenLogic extends BaseNode {
         this,
         'params',
       );
-    } else if (Assert.isParam(options)) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -671,7 +664,7 @@ export class OverriddenLogic extends BaseNode {
         this,
         'returns',
       );
-    } else if (Assert.isReturn(options)) {
+    } else if (asserts.isReturn(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       ret = options;
       Object.assign(ret, relationOptions);
@@ -821,7 +814,7 @@ export class OverriddenLogic extends BaseNode {
         this,
         'variables',
       );
-    } else if (Assert.isVariable(options)) {
+    } else if (asserts.isVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       variable = options;
       Object.assign(variable, relationOptions);
@@ -942,7 +935,7 @@ export class OverriddenLogic extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'body' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -1043,7 +1036,7 @@ export class OverriddenLogic extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'playground' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -1750,7 +1743,11 @@ export class OverriddenLogic extends BaseNode {
           code += indent((state?.tabSize || 0) + 1);
           code += 'const __LogicEmpty: any = null;';
         }
-      } else if (self.body.length <= 2 && !Assert.isNamespace(self.parentNode) && !Assert.isProcess(self.parentNode)) {
+      } else if (
+        self.body.length <= 2 &&
+        !asserts.isNamespace(self.parentNode) &&
+        !asserts.isProcess(self.parentNode)
+      ) {
         code += indent((state?.tabSize || 0) + 1);
         code += `${indent(state?.tabSize || 0 + 4)}const __LogicEmpty: any = null;`;
       }
@@ -1812,8 +1809,8 @@ export class OverriddenLogic extends BaseNode {
     const advanceMap: Map<Return | Variable, Assignment | BatchAssignment> = new Map();
     const needGetSourceMapOqlList: Promise<any>[] = [];
     yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
-      if (el && (Assert.isBatchAssignment(el) || (Assert.isAssignment(el) && el.left?.name))) {
-        if (Assert.isAssignment(el)) {
+      if (el && (asserts.isBatchAssignment(el) || (asserts.isAssignment(el) && el.left?.name))) {
+        if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
             (variable) => !variable.typeAnnotation && el.left?.name === variable.name,
           );
@@ -1824,7 +1821,7 @@ export class OverriddenLogic extends BaseNode {
           if (advanceRn && !advanceMap.get(advanceRn)) {
             advanceMap.set(advanceRn, el);
           }
-        } else if (Assert.isBatchAssignment(el)) {
+        } else if (asserts.isBatchAssignment(el)) {
           yield* wrapForEach(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
             const leftCode =
               leftIndex.length === 1
@@ -1878,7 +1875,7 @@ export class OverriddenLogic extends BaseNode {
       code += `${indent((state?.tabSize || 0) + 1)}// @ts-ignore\n`;
       code += `${indent((state?.tabSize || 0) + 1)}let `;
       code += yield* node.toEmbeddedTS(shiftState(state, code, { inline: true }));
-      if (Assert.isBatchAssignment(assignment)) {
+      if (asserts.isBatchAssignment(assignment)) {
         yield* wrapForEach(assignment.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
           const leftCode =
             leftIndex.length === 1
@@ -1893,7 +1890,7 @@ export class OverriddenLogic extends BaseNode {
             // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
             if (
               rightNode?.typeAnnotation &&
-              !(Assert.isCallQueryComponent(rightNode) && rightNode.ideVersion !== '2.11')
+              !(asserts.isCallQueryComponent(rightNode) && rightNode.ideVersion !== '2.11')
             ) {
               code += ': ';
               code += yield* rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
@@ -1923,7 +1920,10 @@ export class OverriddenLogic extends BaseNode {
       } else {
         const rightNode: any = assignment.right;
         // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
-        if (rightNode?.typeAnnotation && !(Assert.isCallQueryComponent(rightNode) && rightNode.ideVersion !== '2.11')) {
+        if (
+          rightNode?.typeAnnotation &&
+          !(asserts.isCallQueryComponent(rightNode) && rightNode.ideVersion !== '2.11')
+        ) {
           code += ': ';
           code += yield* rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
             returnOrigin('null');
@@ -1933,7 +1933,7 @@ export class OverriddenLogic extends BaseNode {
           // 因为右侧枚举要赋值就得new 一下；
           if (
             rightNode &&
-            Assert.isIdentifier(rightNode) &&
+            asserts.isIdentifier(rightNode) &&
             rightNode.namespace &&
             rightNode.namespace.endsWith('enums')
           ) {
@@ -1952,7 +1952,7 @@ export class OverriddenLogic extends BaseNode {
       code += `${indent((state?.tabSize || 0) + 1)}return ${self.returns[0].name};\n`;
     } else {
       // 如果长度小于2 并且不是虚拟节点就 加 报错，
-      if (self.body.length <= 2 && !Assert.isNamespace(self.parentNode)) {
+      if (self.body.length <= 2 && !asserts.isNamespace(self.parentNode)) {
         code += indent((state?.tabSize || 0) + 1);
         code += 'const __LogicEmpty: any = null;';
       }
@@ -1977,10 +1977,10 @@ export class OverriddenLogic extends BaseNode {
 
   *getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any) {
     code = code.replaceAll('\n', ' ');
-    if (Assert.isAssignment(assignment) && !assignment.right) return code;
+    if (asserts.isAssignment(assignment) && !assignment.right) return code;
 
     // 调用接口，参数替换成 null
-    if (Assert.isCallInterface(rightNode)) {
+    if (asserts.isCallInterface(rightNode)) {
       const { _interface } = rightNode.getModuleInterface();
       return _interface
         ? `${rightNode.tsCalleeKey}(${(_interface as Interface).params.map(() => 'null').join(',')})`
@@ -1988,7 +1988,7 @@ export class OverriddenLogic extends BaseNode {
     }
 
     // 调用服务端逻辑，参数替换成 null
-    if (Assert.isCallLogic(rightNode) && rightNode.calleeNamespace === 'app.logics') {
+    if (asserts.isCallLogic(rightNode) && rightNode.calleeNamespace === 'app.logics') {
       const calleeName = rightNode?.calleeName;
       const calleeLogic = this.app.logics.find((l) => l.name === calleeName);
       return calleeLogic ? `app.logics.${calleeName}(${calleeLogic.params.map(() => 'null').join(',')})` : null;
@@ -2052,7 +2052,7 @@ export class OverriddenLogic extends BaseNode {
     if (code.includes(expressionTsCode)) {
       let typeCode = '';
       yield* wrapForEach(matchCase.patterns, function* wrapForEach(pattern, index) {
-        if (Assert.isTypeAnnotation(pattern)) {
+        if (asserts.isTypeAnnotation(pattern)) {
           if (index === 0) {
             typeCode += yield* pattern.toEmbeddedTS();
           } else {
@@ -2141,7 +2141,7 @@ export class OverriddenLogic extends BaseNode {
    */
   getEmbeddedFilePath(name = this.name) {
     let _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
-    if (Assert.isFrontendLibrary(this.parentNode)) {
+    if (asserts.isFrontendLibrary(this.parentNode)) {
       _path += `/frontends/${this.parentNode.type}`;
     }
     return `/embedded/${this.app.name}${_path}/overriddenLogics/${name}.ts`;
@@ -2190,7 +2190,7 @@ export class OverriddenLogic extends BaseNode {
     const set = new Set();
     utils.traverse(
       ({ node }) => {
-        if (Assert.isCallQueryComponent(node)) {
+        if (asserts.isCallQueryComponent(node)) {
           set.add(node);
         }
       },
@@ -2263,7 +2263,7 @@ export class OverriddenLogic extends BaseNode {
 
   // 获取bindEvent下的logic的名称
   getEventLogicName(type?: string) {
-    if (Assert.isBindEvent(this.parentNode)) {
+    if (asserts.isBindEvent(this.parentNode)) {
       if (type === 'chinese') {
         const bindEvent = this.parentNode;
         const bindChineseName = bindEvent.getPageViewEventChineseName();

package/src/concepts/ParamWithGroup__.ts

@@ -0,0 +1,101 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+
+import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
+import { v4 as uuidv4 } from 'uuid';
+import Param from './Param__';
+
+/**
+ * 参数分组
+ */
+@concept('参数分组')
+export class ParamWithGroup extends Param {
+  /** 类名 */
+  static readonly ConceptName: string = 'ParamWithGroup';
+
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['Param', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'ParamWithGroup';
+
+  /**
+   * 参数分组标题
+   */
+  @property()
+  title!: string;
+
+  /**
+   * 类别
+   */
+  @property()
+  group!: string;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<any>) {
+    source = Object.assign({}, ParamWithGroup.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): any {
+    return super.from(source, parentNode, parentKey) as any;
+  }
+
+  /**
+   * 设置参数分组标题
+   */
+  setTitle(title: string) {
+    const object = {
+      title,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  /**
+   * 设置类别
+   */
+  setGroup(group: string) {
+    const object = {
+      group,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+  static getDefaultOptions() {
+    return {
+      group: '主要属性',
+    };
+  }
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default ParamWithGroup;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Param__.ts

@@ -33,8 +33,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type TypeAnnotation from './TypeAnnotation__';
@@ -52,13 +52,12 @@ import type Process from './Process__';
  * 输入参数
  */
 @concept('输入参数')
-// @ts-ignore
 export class Param extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Param';
+  static readonly ConceptName: string = 'Param';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -71,14 +70,12 @@ export class Param extends BaseNode {
    * 输入参数名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 输入参数描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -87,14 +84,12 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
@@ -103,7 +98,6 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -367,17 +361,25 @@ export class Param extends BaseNode {
   toJS(state?: TranslatorState): string {
     if (this.view) {
       const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+      let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+      if (typeNamespace?.endsWith('.metadataTypes')) {
+        const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+        const typeAn = referenceNode.typeAnnotation || {};
+        sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+        typeKind = typeAn.typeKind;
+        typeName = typeAn.typeName;
+      }
       const needGenInitFromSchema =
         typeAnnotation &&
-        (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+        (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
       let code = `${this.name} = `;
       if (needGenInitFromSchema) {
-        code += `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+        code += `this.$genInitFromSchema('${sortedTypeKey}',`;
       }
 
       const expressionJS = this.defaultValue?.toJS?.();
 
-      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
+      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
       if (needGenInitFromSchema) {
         code += `)`;
       }
@@ -421,7 +423,7 @@ export class Param extends BaseNode {
       const { typeAnnotation } = referenceNode || {};
       typeKey = `${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
     }
-    if (Assert.isFunction(self.defaultExpression) || Assert.isAnonymousFunction(self.defaultExpression)) {
+    if (asserts.isFunction(self.defaultExpression) || asserts.isAnonymousFunction(self.defaultExpression)) {
       code += self.required ? ': ' : '?: ';
       code += yield* self.defaultExpression.toEmbeddedTSDefinition(shiftState(state, code));
     } else if (!dontType && self.typeAnnotation) {
@@ -463,7 +465,7 @@ export class Param extends BaseNode {
       return code;
     }
 
-    if (Assert.isFunction(this.defaultExpression) || Assert.isAnonymousFunction(this.defaultExpression)) {
+    if (asserts.isFunction(this.defaultExpression) || asserts.isAnonymousFunction(this.defaultExpression)) {
       code += this.required ? ': ' : '?: ';
       code += runSync(this.defaultExpression.toEmbeddedTSDefinition(shiftState(state, code)));
     } else if (!dontType && this.typeAnnotation) {

package/src/concepts/Point__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 
@@ -15,13 +15,12 @@ import BaseNode from '../common/BaseNode';
  * 点信息
  */
 @concept('点信息')
-// @ts-ignore
 export class Point extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Point';
+  static readonly ConceptName: string = 'Point';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -34,14 +33,12 @@ export class Point extends BaseNode {
    * x
    */
   @property()
-  // @ts-ignore
   x!: number;
 
   /**
    * y
    */
   @property()
-  // @ts-ignore
   y!: number;
 
   /**

package/src/concepts/ProcessComponent__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type Attribute from './Attribute__';
@@ -19,13 +19,12 @@ import type App from './App__';
  * 流程组件
  */
 @concept('流程组件')
-// @ts-ignore
 export class ProcessComponent extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ProcessComponent';
+  static readonly ConceptName: string = 'ProcessComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -38,28 +37,24 @@ export class ProcessComponent extends BaseNode {
    * 流程组件名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 流程组件标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 流程组件描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * category
    */
   @property()
-  // @ts-ignore
   category!: string;
 
   /**
@@ -172,7 +167,7 @@ export class ProcessComponent extends BaseNode {
         this,
         'attrs',
       );
-    } else if (Assert.isAttribute(options)) {
+    } else if (asserts.isAttribute(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       attribute = options;
       Object.assign(attribute, relationOptions);
@@ -326,7 +321,7 @@ export class ProcessComponent extends BaseNode {
         this,
         'logics',
       );
-    } else if (Assert.isLogic(options)) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);