@lcap/nasl 3.4.0-beta.6 → 3.5.0-alpha.1

package/src/concepts/Destination__.ts

@@ -1,5 +1,5 @@
 import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
-import View from './View__';
+import type View from './View__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 import {
   TranslatorState,
@@ -19,27 +19,26 @@ import { BindAttribute, Param } from '..';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 BaseNode from '../common/BaseNode';
-import Argument from './Argument__';
-import Anchor from './Anchor__';
 import LogicItem from './LogicItem__';
+import type Argument from './Argument__';
+import type Anchor from './Anchor__';
 
 /**
  * 跳转页面
  */
-@className
 @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;
 
   /**
@@ -174,8 +170,9 @@ export class Destination extends LogicItem {
   _insertArgumentAt(options: Partial<Argument> | Argument, index: number) {
     const argumentOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'arguments' };
+    const Argument = getConceptConstructor('Argument');
     let argument: Argument;
-    if (options instanceof Argument) {
+    if (asserts.isArgument(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       argument = options;
       Object.assign(argument, relationOptions);
@@ -504,7 +501,7 @@ export class Destination extends LogicItem {
     return url;
   }
 
-  toJS(): string {
+  toJS(state?: TranslatorState): string {
     let url = '';
     const viewArr = this.genViewArr();
     if (Array.isArray(viewArr) && viewArr.length) {
@@ -521,7 +518,7 @@ export class Destination extends LogicItem {
         const logicParamLength = logicParam.length;
         const args = completeArguments
           .map((arg, index) => {
-            const value = arg?.toJS();
+            const value = arg?.toJS(state);
             let argStr = '';
             if (value && index < logicParamLength) {
               argStr += `${arg.keyword}=` + '${';
@@ -538,7 +535,7 @@ export class Destination extends LogicItem {
         url += `?${args.join('&')}`;
       }
       if (this.anchor) {
-        const anchor = this.anchor.toJS();
+        const anchor = this.anchor.toJS(state);
         if (anchor) url += `#\${${anchor}}`;
       }
       url += '`,"';
@@ -560,6 +557,7 @@ export class Destination extends LogicItem {
    * 设置view
    */
   setView(view: View) {
+    const Argument = getConceptConstructor('Argument');
     const object = {
       viewNamespace: view.getNamespace(),
       viewName: view.name,
@@ -586,6 +584,7 @@ export class Destination extends LogicItem {
    * 设置view的argument
    */
   addCalleeArg(view: View) {
+    const Argument = getConceptConstructor('Argument');
     const newArgs = this.arguments.map((argument) =>
       Argument.from(
         {
@@ -732,7 +731,7 @@ export class Destination extends LogicItem {
       logicParam = node.params;
     }
     const logicParamLength = logicParam.length;
-    if (self.parentNode instanceof BindAttribute) {
+    if (asserts.isBindAttribute(self.parentNode)) {
       code += indent((state?.tabSize || 0) + 2);
       if (self.tsCalleeNamespace && self.tsName) {
         code += `${self.tsCalleeNamespace}.${self.tsName}.$destination({`;
@@ -782,7 +781,7 @@ export class Destination extends LogicItem {
     }
     const logicParamLength = logicParam.length;
 
-    if (this.parentNode instanceof BindAttribute) {
+    if (asserts.isBindAttribute(this.parentNode)) {
       code += indent(state.tabSize + 2);
       if (this.tsCalleeNamespace && this.tsName) {
         code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
@@ -872,6 +871,7 @@ export class Destination extends LogicItem {
     const node = this.viewNode as View;
     const logicParam: Map<string, Param> = new Map();
     const Arguments: Argument[] = [];
+    const Argument = getConceptConstructor('Argument');
     if (node?.params) {
       node.params.forEach((param) => {
         logicParam.set(param.name, param);

package/src/concepts/End__.ts

@@ -6,32 +6,31 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import Return from './Return__';
-import Logic from './Logic__';
+import type Return from './Return__';
+import type Logic from './Logic__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
 /**
  * 结束节点
  */
-@className
 @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'];
 
   /**
    * 产品概念

package/src/concepts/EntityIndex__.ts

@@ -15,28 +15,28 @@ type changeType = 'up' | 'down';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 BaseNode from '../common/BaseNode';
-import Entity from './Entity__';
-import Module from './Module__';
-import App from './App__';
-import DataSource from './DataSource__';
+import type Entity from './Entity__';
+import type Module from './Module__';
+import type App from './App__';
+import type DataSource from './DataSource__';
 
 /**
  * 实体索引
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -49,14 +49,12 @@ export class EntityIndex extends BaseNode {
    * 实体索引名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 数据库索引名
    */
   @property()
-  // @ts-ignore
   indexName!: string;
 
   /**
@@ -72,14 +70,12 @@ export class EntityIndex extends BaseNode {
    * 是否唯一
    */
   @property()
-  // @ts-ignore
   unique!: boolean;
 
   /**
    * 实体索引描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**

package/src/concepts/EntityProperty__.ts

@@ -10,40 +10,44 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import CallQueryComponent from './CallQueryComponent__';
+import type CallQueryComponent from './CallQueryComponent__';
 
 type changeType = 'up' | 'down';
 
+interface defaultCode {
+  code?: string;
+  executeCode?: boolean;
+}
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 BaseNode from '../common/BaseNode';
-import TypeAnnotation from './TypeAnnotation__';
-import DatabaseTypeAnnotation from './DatabaseTypeAnnotation__';
-import DefaultValue from './DefaultValue__';
-import Entity from './Entity__';
-import Module from './Module__';
-import App from './App__';
-import DataSource from './DataSource__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type DatabaseTypeAnnotation from './DatabaseTypeAnnotation__';
+import type DefaultValue from './DefaultValue__';
+import type Entity from './Entity__';
+import type Module from './Module__';
+import type App from './App__';
+import type DataSource from './DataSource__';
 
 /**
  * 实体属性
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -56,7 +60,6 @@ export class EntityProperty extends BaseNode {
    * 实体属性名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -69,21 +72,18 @@ export class EntityProperty extends BaseNode {
    * 数据库列名
    */
   @property()
-  // @ts-ignore
   columnName!: string;
 
   /**
    * 实体属性标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 实体属性描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -92,7 +92,6 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -101,14 +100,12 @@ export class EntityProperty extends BaseNode {
   @property({
     objectRef: 'DatabaseTypeAnnotation',
   })
-  // @ts-ignore
   databaseTypeAnnotation!: DatabaseTypeAnnotation;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
   required!: boolean;
 
   /**
@@ -117,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';
 
   /**
@@ -185,7 +176,6 @@ export class EntityProperty extends BaseNode {
    * 表示 Oracle 主键自增时的序列名称
    */
   @property()
-  // @ts-ignore
   sequence!: string;
 
   /**
@@ -950,7 +940,7 @@ export class EntityProperty extends BaseNode {
    * 默认值toJS的结果
    */
   @property()
-  defaultCode: string = undefined;
+  defaultCode: defaultCode = {};
 
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/Entity__.ts

@@ -1,6 +1,6 @@
 import { wrapForEachToGenerator as wrapForEach, runGeneratorSync as runSync } from '../utils/time-slicing';
 import type { EmbeddedTSFileGenerator } from '../utils';
-import Namespace from './Namespace__';
+import type Namespace from './Namespace__';
 import {
   TranslatorState,
   shiftState,
@@ -12,35 +12,35 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
-import CallQueryComponent from './CallQueryComponent__';
+import type CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 BaseNode from '../common/BaseNode';
-import EntityProperty from './EntityProperty__';
-import EntityIndex from './EntityIndex__';
-import Module from './Module__';
-import DataSource from './DataSource__';
-import App from './App__';
+import type EntityProperty from './EntityProperty__';
+import type EntityIndex from './EntityIndex__';
+import type Module from './Module__';
+import type DataSource from './DataSource__';
+import type App from './App__';
 
 /**
  * 实体
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -53,7 +53,6 @@ export class Entity extends BaseNode {
    * 实体名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -66,14 +65,12 @@ export class Entity extends BaseNode {
    * 数据库表名
    */
   @property()
-  // @ts-ignore
   tableName!: string;
 
   /**
    * 实体描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -191,6 +188,7 @@ export class Entity extends BaseNode {
   _insertPropertyAt(options: string | Partial<EntityProperty> | EntityProperty, index: number) {
     const propertyOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'properties' };
+    const EntityProperty = getConceptConstructor('EntityProperty');
     let property: EntityProperty;
     if (!options) {
       property = EntityProperty.from(
@@ -210,7 +208,7 @@ export class Entity extends BaseNode {
         this,
         'properties',
       );
-    } else if (options instanceof EntityProperty) {
+    } else if (asserts.isEntityProperty(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       property = options;
       Object.assign(property, relationOptions);
@@ -344,6 +342,7 @@ export class Entity extends BaseNode {
   _insertEntityIndexAt(options: string | Partial<EntityIndex> | EntityIndex, index: number) {
     const entityIndexOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'indexes' };
+    const EntityIndex = getConceptConstructor('EntityIndex');
     let entityIndex: EntityIndex;
     if (!options) {
       entityIndex = EntityIndex.from(
@@ -363,7 +362,7 @@ export class Entity extends BaseNode {
         this,
         'indexes',
       );
-    } else if (options instanceof EntityIndex) {
+    } else if (asserts.isEntityIndex(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       entityIndex = options;
       Object.assign(entityIndex, relationOptions);
@@ -947,16 +946,14 @@ export class Entity extends BaseNode {
   }
 
   get ns() {
-    const ns: Namespace = entity2LogicNamespace(this);
+    // TODO: 改为缓存模式
+    const ns = entity2LogicNamespace(this);
     ns.path = this.getNamespace();
     return ns;
   }
-  // @excludedInJSON()
-  // nslogic: Namespace;
 
   get logics() {
-    const { ns } = this;
-    return ns.logics;
+    return this.ns.logics;
   }
 
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {

package/src/concepts/EnumItem__.ts

@@ -12,27 +12,27 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 BaseNode from '../common/BaseNode';
-import Enum from './Enum__';
-import Module from './Module__';
-import App from './App__';
+import type Enum from './Enum__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 枚举值
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -45,14 +45,12 @@ export class EnumItem extends BaseNode {
    * 枚举值的值
    */
   @property()
-  // @ts-ignore
   value!: string;
 
   /**
    * 枚举值标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**

package/src/concepts/Enum__.ts

@@ -10,34 +10,34 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import Namespace from './Namespace__';
-import Identifier from './Identifier__';
+import type Namespace from './Namespace__';
+import type Identifier from './Identifier__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 BaseNode from '../common/BaseNode';
-import EnumItem from './EnumItem__';
-import Module from './Module__';
-import App from './App__';
+import type EnumItem from './EnumItem__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 枚举
  */
-@className
 @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'];
 
   /**
    * 产品概念
@@ -50,21 +50,18 @@ export class Enum extends BaseNode {
    * 枚举名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 枚举标题
    */
   @property()
-  // @ts-ignore
   label!: string;
 
   /**
    * 枚举描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -168,8 +165,9 @@ export class Enum extends BaseNode {
   _insertEnumItemAt(options: Partial<EnumItem> | EnumItem, index: number) {
     const enumItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'enumItems' };
+    const EnumItem = getConceptConstructor('EnumItem');
     let enumItem: EnumItem;
-    if (options instanceof EnumItem) {
+    if (asserts.isEnumItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       enumItem = options;
       Object.assign(enumItem, relationOptions);