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

package/src/concepts/DatabaseTypeAnnotation__.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 DatabaseTypeAnnotation extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'DatabaseTypeAnnotation';
+  static readonly ConceptName: string = 'DatabaseTypeAnnotation';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -34,14 +33,12 @@ export class DatabaseTypeAnnotation extends BaseNode {
    * 类型名称
    */
   @property()
-  // @ts-ignore
   typeName!: string;
 
   /**
    * 类型参数
    */
   @property()
-  // @ts-ignore
   arguments!: Map<string, string>;
 
   /**

package/src/concepts/DefaultValue__.ts

@@ -8,8 +8,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 LogicItem from './LogicItem__';
@@ -18,13 +18,12 @@ import type LogicItem from './LogicItem__';
  * 默认值
  */
 @concept('默认值')
-// @ts-ignore
 export class DefaultValue extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'DefaultValue';
+  static readonly ConceptName: string = 'DefaultValue';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -39,7 +38,6 @@ export class DefaultValue extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
@@ -110,7 +108,7 @@ export class DefaultValue 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);
@@ -281,7 +279,10 @@ export class DefaultValue extends BaseNode {
     if (state?.getVuePrototype && this.expression?.concept === 'NullLiteral') {
       return null;
     }
-    if (['Date', 'Time', 'DateTime'].includes((this.parentNode as any)?.typeAnnotation?.typeName) && (this.expression as any)?.value === '') {
+    if (
+      ['Date', 'Time', 'DateTime'].includes((this.parentNode as any)?.typeAnnotation?.typeName) &&
+      (this.expression as any)?.value === ''
+    ) {
       return null;
     }
 

package/src/concepts/Destination__.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__';
 import type Argument from './Argument__';
@@ -33,13 +33,12 @@ import type Anchor from './Anchor__';
  * 跳转页面
  */
 @concept('跳转页面')
-// @ts-ignore
 export class Destination extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Destination';
+  static readonly ConceptName: string = 'Destination';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -58,14 +57,12 @@ export class Destination extends LogicItem {
    * viewNamespace
    */
   @property()
-  // @ts-ignore
   viewNamespace!: string;
 
   /**
    * viewName
    */
   @property()
-  // @ts-ignore
   viewName!: string;
 
   /**
@@ -90,7 +87,6 @@ export class Destination extends LogicItem {
   @property({
     objectRef: 'Anchor',
   })
-  // @ts-ignore
   anchor!: Anchor;
 
   /**
@@ -176,7 +172,7 @@ export class Destination extends LogicItem {
     const relationOptions = { parentNode: this, parentKey: 'arguments' };
     const Argument = getConceptConstructor('Argument');
     let argument: Argument;
-    if (Assert.isArgument(options)) {
+    if (asserts.isArgument(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       argument = options;
       Object.assign(argument, relationOptions);
@@ -371,7 +367,7 @@ export class Destination extends LogicItem {
     let code = '';
     const viewArr = this.genViewArr();
     if (Array.isArray(viewArr) && viewArr.length) {
-      code += `let url = '${this.viewNode.frontend.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join(
+      code += `let url = '${this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join(
         '/',
       )}';\n`;
       const { completeArguments } = this;
@@ -695,7 +691,7 @@ export class Destination extends LogicItem {
       });
     }
     if (this.viewNode) {
-      return `${this.viewNode.frontend.prefixPath}/${viewNameAttr.join('/')}`;
+      return `${this.viewNode?.frontend?.prefixPath}/${viewNameAttr.join('/')}`;
     }
     return `/${viewNameAttr.join('/')}`;
   }
@@ -735,7 +731,7 @@ export class Destination extends LogicItem {
       logicParam = node.params;
     }
     const logicParamLength = logicParam.length;
-    if (Assert.isBindAttribute(self.parentNode)) {
+    if (asserts.isBindAttribute(self.parentNode)) {
       code += indent((state?.tabSize || 0) + 2);
       if (self.tsCalleeNamespace && self.tsName) {
         code += `${self.tsCalleeNamespace}.${self.tsName}.$destination({`;
@@ -785,7 +781,7 @@ export class Destination extends LogicItem {
     }
     const logicParamLength = logicParam.length;
 
-    if (Assert.isBindAttribute(this.parentNode)) {
+    if (asserts.isBindAttribute(this.parentNode)) {
       code += indent(state.tabSize + 2);
       if (this.tsCalleeNamespace && this.tsName) {
         code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;

package/src/concepts/End__.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 LogicItem from './LogicItem__';
 
@@ -25,13 +25,12 @@ import LogicItem from './LogicItem__';
  * 结束节点
  */
 @concept('结束节点')
-// @ts-ignore
 export class End extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'End';
+  static readonly ConceptName: string = 'End';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -100,6 +99,7 @@ export class End extends LogicItem {
         // 旧逻辑默认走这里，
         // 期望后期可以直接走完整的case， default 直接抛出异常好更明确定位错误
         logic =
+          self.getAncestor('BusinessLogic') ||
           self.parentNode.getAncestor('Logic') ||
           self.parentNode.getAncestor('AuthLogic') ||
           self.parentNode.getAncestor('AuthLogicForCallInterface') ||

package/src/concepts/EntityIndex__.ts

@@ -18,8 +18,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 Entity from './Entity__';
@@ -31,13 +31,12 @@ import type DataSource from './DataSource__';
  * 实体索引
  */
 @concept('实体索引')
-// @ts-ignore
 export class EntityIndex extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'EntityIndex';
+  static readonly ConceptName: string = 'EntityIndex';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -50,14 +49,12 @@ export class EntityIndex extends BaseNode {
    * 实体索引名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 数据库索引名
    */
   @property()
-  // @ts-ignore
   indexName!: string;
 
   /**
@@ -73,14 +70,12 @@ export class EntityIndex extends BaseNode {
    * 是否唯一
    */
   @property()
-  // @ts-ignore
   unique!: boolean;
 
   /**
    * 实体索引描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**

package/src/concepts/EntityProperty__.ts

@@ -26,8 +26,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__';
@@ -42,13 +42,12 @@ import type DataSource from './DataSource__';
  * 实体属性
  */
 @concept('实体属性')
-// @ts-ignore
 export class EntityProperty extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'EntityProperty';
+  static readonly ConceptName: string = 'EntityProperty';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -61,7 +60,6 @@ export class EntityProperty extends BaseNode {
    * 实体属性名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -74,21 +72,18 @@ export class EntityProperty extends BaseNode {
    * 数据库列名
    */
   @property()
-  // @ts-ignore
   columnName!: string;
 
   /**
    * 实体属性标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 实体属性描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -97,7 +92,6 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -106,14 +100,12 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'DatabaseTypeAnnotation',
   })
-  // @ts-ignore
   databaseTypeAnnotation!: DatabaseTypeAnnotation;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
@@ -122,42 +114,36 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
    * 当前属性是否为主键
    */
   @property()
-  // @ts-ignore
   primaryKey!: boolean;
 
   /**
    * 关联实体的命名空间
    */
   @property()
-  // @ts-ignore
   relationNamespace!: string;
 
   /**
    * 关联实体
    */
   @property()
-  // @ts-ignore
   relationEntity!: string;
 
   /**
    * 关联属性
    */
   @property()
-  // @ts-ignore
   relationProperty!: string;
 
   /**
    * 关联属性实体记录删除规则
    */
   @property()
-  // @ts-ignore
   deleteRule!: 'protect' | 'cascade';
 
   /**
@@ -190,7 +176,6 @@ export class EntityProperty extends BaseNode {
    * 表示 Oracle 主键自增时的序列名称
    */
   @property()
-  // @ts-ignore
   sequence!: string;
 
   /**

package/src/concepts/Entity__.ts

@@ -21,8 +21,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 EntityProperty from './EntityProperty__';
@@ -35,13 +35,12 @@ import type App from './App__';
  * 实体
  */
 @concept('实体')
-// @ts-ignore
 export class Entity extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Entity';
+  static readonly ConceptName: string = 'Entity';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -54,7 +53,6 @@ export class Entity extends BaseNode {
    * 实体名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -67,14 +65,12 @@ export class Entity extends BaseNode {
    * 数据库表名
    */
   @property()
-  // @ts-ignore
   tableName!: string;
 
   /**
    * 实体描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -212,7 +208,7 @@ export class Entity extends BaseNode {
         this,
         'properties',
       );
-    } else if (Assert.isEntityProperty(options)) {
+    } else if (asserts.isEntityProperty(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       property = options;
       Object.assign(property, relationOptions);
@@ -366,7 +362,7 @@ export class Entity extends BaseNode {
         this,
         'indexes',
       );
-    } else if (Assert.isEntityIndex(options)) {
+    } else if (asserts.isEntityIndex(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       entityIndex = options;
       Object.assign(entityIndex, relationOptions);
@@ -949,33 +945,17 @@ export class Entity extends BaseNode {
     return `/embedded/${this.app.name}/datasources/${this.parentNode.name}/entities/${name}.ts`;
   }
 
-  /**
-   * 虚拟方法
-   */
-  @excludedInJSON()
-  private _virtualNs?: Namespace;
-
   get ns() {
-    // TODO: 缓存模式
-    // if (this._virtualNs) {
-    //   return this._virtualNs;
-    // }
-
-    this._virtualNs = entity2LogicNamespace(this);
-    this._virtualNs.path = this.getNamespace();
-
-    return this._virtualNs;
+    // TODO: 改为缓存模式
+    const ns = entity2LogicNamespace(this);
+    ns.path = this.getNamespace();
+    return ns;
   }
 
   get logics() {
     return this.ns.logics;
   }
 
-  resetVirtualNs() {
-    this._virtualNs.logics = [];
-    this._virtualNs = undefined;
-  }
-
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
     let code = `namespace ${this.getNamespace()} {\n`;
     code += '    @nasl.annotation.Entity()\n';

package/src/concepts/EnumItem__.ts

@@ -15,8 +15,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 Enum from './Enum__';
@@ -27,13 +27,12 @@ import type App from './App__';
  * 枚举值
  */
 @concept('枚举值')
-// @ts-ignore
 export class EnumItem extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'EnumItem';
+  static readonly ConceptName: string = 'EnumItem';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -46,14 +45,12 @@ export class EnumItem extends BaseNode {
    * 枚举值的值
    */
   @property()
-  // @ts-ignore
   value!: string;
 
   /**
    * 枚举值标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**

package/src/concepts/Enum__.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 BaseNode from '../common/BaseNode';
 import type EnumItem from './EnumItem__';
@@ -32,13 +32,12 @@ import type App from './App__';
  * 枚举
  */
 @concept('枚举')
-// @ts-ignore
 export class Enum extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Enum';
+  static readonly ConceptName: string = 'Enum';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -51,21 +50,18 @@ export class Enum extends BaseNode {
    * 枚举名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 枚举标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 枚举描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -171,7 +167,7 @@ export class Enum extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'enumItems' };
     const EnumItem = getConceptConstructor('EnumItem');
     let enumItem: EnumItem;
-    if (Assert.isEnumItem(options)) {
+    if (asserts.isEnumItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       enumItem = options;
       Object.assign(enumItem, relationOptions);