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

package/src/concepts/Argument__.ts

@@ -22,8 +22,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 LogicItem from './LogicItem__';
 
@@ -31,13 +31,12 @@ import LogicItem from './LogicItem__';
  * 实际参数
  */
 @concept('实际参数')
-// @ts-ignore
 export class Argument extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Argument';
+  static readonly ConceptName: string = 'Argument';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -50,14 +49,12 @@ export class Argument extends LogicItem {
    * 参数名
    */
   @property()
-  // @ts-ignore
   keyword!: string;
 
   /**
    * 是否为展开参数
    */
   @property()
-  // @ts-ignore
   spread!: boolean;
 
   /**
@@ -66,7 +63,6 @@ export class Argument extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**

package/src/concepts/Assignee__.ts

@@ -19,8 +19,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 LogicItem from './LogicItem__';
 import type Logic from './Logic__';
@@ -29,13 +29,12 @@ import type Logic from './Logic__';
  * 经办人
  */
 @concept('经办人')
-// @ts-ignore
 export class Assignee extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Assignee';
+  static readonly ConceptName: string = 'Assignee';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -159,7 +158,7 @@ export class Assignee extends LogicItem {
         this,
         'dynamicUsers',
       );
-    } else if (Assert.isLogicItem(options)) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -305,7 +304,7 @@ export class Assignee extends LogicItem {
         this,
         'dynamicRoles',
       );
-    } else if (Assert.isLogicItem(options)) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -459,7 +458,7 @@ export class Assignee extends LogicItem {
         this,
         'logicUsers',
       );
-    } else if (Assert.isLogic(options)) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);

package/src/concepts/AssignmentLine__.ts

@@ -16,8 +16,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';
 
@@ -25,13 +25,12 @@ import BaseNode from '../common/BaseNode';
  * 赋值连线
  */
 @concept('赋值连线')
-// @ts-ignore
 export class AssignmentLine extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'AssignmentLine';
+  static readonly ConceptName: string = 'AssignmentLine';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/Assignment__.ts

@@ -22,8 +22,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 LogicItem from './LogicItem__';
 
@@ -31,13 +31,12 @@ import LogicItem from './LogicItem__';
  * 赋值语句
  */
 @concept('赋值语句')
-// @ts-ignore
 export class Assignment extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Assignment';
+  static readonly ConceptName: string = 'Assignment';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -58,7 +57,6 @@ export class Assignment extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   left!: LogicItem;
 
   /**
@@ -67,7 +65,6 @@ export class Assignment extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   right!: LogicItem;
 
   /**
@@ -331,7 +328,7 @@ export class Assignment extends LogicItem {
     // 因为右侧枚举要赋值就得new 一下；
     if (
       self.right &&
-      Assert.isIdentifier(self.right) &&
+      asserts.isIdentifier(self.right) &&
       self.right.namespace &&
       self.right.namespace.endsWith('enums')
     ) {
@@ -354,7 +351,7 @@ export class Assignment extends LogicItem {
     // 因为右侧枚举要赋值就得new 一下；
     if (
       this.right &&
-      Assert.isIdentifier(this.right) &&
+      asserts.isIdentifier(this.right) &&
       this.right.namespace &&
       this.right.namespace.endsWith('enums')
     ) {

package/src/concepts/Attribute__.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 TypeAnnotation from './TypeAnnotation__';
@@ -20,13 +20,12 @@ import type App from './App__';
  * 组件属性
  */
 @concept('组件属性')
-// @ts-ignore
 export class Attribute extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Attribute';
+  static readonly ConceptName: string = 'Attribute';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -39,28 +38,24 @@ export class Attribute extends BaseNode {
    * 组件属性名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 组件属性分组
    */
   @property()
-  // @ts-ignore
   group!: string;
 
   /**
    * 组件属性标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 组件属性描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -69,14 +64,12 @@ export class Attribute extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
@@ -85,28 +78,24 @@ export class Attribute extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
    * 是否支持双向绑定
    */
   @property()
-  // @ts-ignore
   sync!: boolean;
 
   /**
    * 是否为高级功能，不在低代码中显示
    */
   @property()
-  // @ts-ignore
   advanced!: boolean;
 
   /**
    * options
    */
   @property()
-  // @ts-ignore
   options!: Array<{ value: string; title: string }>;
 
   /**

package/src/concepts/AuthInterface__.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 Interface from './Interface__';
 import type Module from './Module__';
@@ -17,13 +17,12 @@ import type App from './App__';
  * 鉴权接口
  */
 @concept('鉴权接口')
-// @ts-ignore
 export class AuthInterface extends Interface {
   /** 类名 */
-  static readonly ConceptName = 'AuthInterface';
+  static readonly ConceptName: string = 'AuthInterface';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['Interface', 'ImportedInterface', 'AbstractInterface', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Interface', 'ImportedInterface', 'AbstractInterface', 'BaseNode'];
 
   /**
    * 产品概念
@@ -36,7 +35,6 @@ export class AuthInterface extends Interface {
    * 关联的鉴权逻辑
    */
   @property()
-  // @ts-ignore
   authLogic!: string;
 
   /**

package/src/concepts/AuthLogicForCallInterface__.ts

@@ -34,8 +34,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 AuthLogic from './AuthLogic__';
 import type Param from './Param__';
@@ -44,13 +44,12 @@ import type Param from './Param__';
  * 调用接口的鉴权逻辑
  */
 @concept('调用接口的鉴权逻辑')
-// @ts-ignore
 export class AuthLogicForCallInterface extends AuthLogic {
   /** 类名 */
-  static readonly ConceptName = 'AuthLogicForCallInterface';
+  static readonly ConceptName: string = 'AuthLogicForCallInterface';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['AuthLogic', 'Logic', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['AuthLogic', 'Logic', 'BaseNode'];
 
   /**
    * 产品概念
@@ -134,7 +133,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
         this,
         'authParams',
       );
-    } else if (Assert.isParam(options)) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -369,8 +368,8 @@ export class AuthLogicForCallInterface extends AuthLogic {
     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,
           );
@@ -381,7 +380,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
           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
@@ -443,7 +442,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
       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
@@ -458,7 +457,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
             // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 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 })) ??
@@ -488,7 +487,10 @@ export class AuthLogicForCallInterface extends AuthLogic {
       } 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');
@@ -498,7 +500,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
           // 因为右侧枚举要赋值就得new 一下；
           if (
             rightNode &&
-            Assert.isIdentifier(rightNode) &&
+            asserts.isIdentifier(rightNode) &&
             rightNode.namespace &&
             rightNode.namespace.endsWith('enums')
           ) {
@@ -518,7 +520,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
       )}return ${self.name}Result;\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;';
       }

package/src/concepts/AuthLogic__.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 Logic from './Logic__';
 import type Module from './Module__';
@@ -21,13 +21,12 @@ import type Process from './Process__';
  * 鉴权逻辑
  */
 @concept('鉴权逻辑')
-// @ts-ignore
 export class AuthLogic extends Logic {
   /** 类名 */
-  static readonly ConceptName = 'AuthLogic';
+  static readonly ConceptName: string = 'AuthLogic';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['Logic', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Logic', 'BaseNode'];
 
   /**
    * 产品概念
@@ -40,7 +39,6 @@ export class AuthLogic extends Logic {
    * 是否为默认鉴权逻辑
    */
   @property()
-  // @ts-ignore
   isDefault!: boolean;
 
   /**

package/src/concepts/BackendVariable__.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__';
@@ -49,13 +49,12 @@ import type Frontend from './Frontend__';
  * 后端全局变量
  */
 @concept('后端全局变量')
-// @ts-ignore
 export class BackendVariable extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'BackendVariable';
+  static readonly ConceptName: string = 'BackendVariable';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -68,14 +67,12 @@ export class BackendVariable extends BaseNode {
    * 后端全局变量名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 后端全局变量描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -84,7 +81,6 @@ export class BackendVariable extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -93,14 +89,12 @@ export class BackendVariable extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
    * 作用域
    */
   @property()
-  // @ts-ignore
   scope!: 'request' | 'applicaion';
 
   /**
@@ -327,12 +321,20 @@ export class BackendVariable extends BaseNode {
   toJS(state?: TranslatorState): string {
     const context = this.view ? 'this' : 'Vue.prototype';
     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 += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
     }
 
     if (this.defaultValue?.expression) {

package/src/concepts/Backend__.ts

@@ -25,8 +25,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 BackendVariable from './BackendVariable__';
@@ -36,13 +36,12 @@ import type App from './App__';
  * 后端
  */
 @concept('后端')
-// @ts-ignore
 export class Backend extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Backend';
+  static readonly ConceptName: string = 'Backend';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -55,7 +54,6 @@ export class Backend extends BaseNode {
    * 后端标识
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -166,7 +164,7 @@ export class Backend extends BaseNode {
         this,
         'variables',
       );
-    } else if (Assert.isBackendVariable(options)) {
+    } else if (asserts.isBackendVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       backendVariable = options;
       Object.assign(backendVariable, relationOptions);

package/src/concepts/BatchAssignment__.ts

@@ -20,8 +20,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 LogicItem from './LogicItem__';
 import type SelectMembers from './SelectMembers__';
@@ -31,13 +31,12 @@ import type AssignmentLine from './AssignmentLine__';
  * 批量赋值语句
  */
 @concept('批量赋值语句')
-// @ts-ignore
 export class BatchAssignment extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'BatchAssignment';
+  static readonly ConceptName: string = 'BatchAssignment';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -58,7 +57,6 @@ export class BatchAssignment extends LogicItem {
   @property({
     objectRef: 'SelectMembers',
   })
-  // @ts-ignore
   left!: SelectMembers;
 
   /**
@@ -203,7 +201,7 @@ export class BatchAssignment extends LogicItem {
         this,
         'rights',
       );
-    } else if (Assert.isSelectMembers(options)) {
+    } else if (asserts.isSelectMembers(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       selectMembers = options;
       Object.assign(selectMembers, relationOptions);
@@ -359,7 +357,7 @@ export class BatchAssignment extends LogicItem {
         this,
         'assignmentLines',
       );
-    } else if (Assert.isAssignmentLine(options)) {
+    } else if (asserts.isAssignmentLine(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       assignmentLine = options;
       Object.assign(assignmentLine, relationOptions);