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

package/src/concepts/Role__.ts

@@ -8,31 +8,31 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import Namespace from './Namespace__';
+import type Namespace from './Namespace__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 App from './App__';
+import type App from './App__';
 
 /**
  * 角色
  */
-@className
 @concept('角色')
-// @ts-ignore
 export class Role extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Role';
+  static readonly ConceptName: string = 'Role';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -45,7 +45,6 @@ export class Role extends BaseNode {
    * 角色名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -58,14 +57,12 @@ export class Role extends BaseNode {
    * 创建时间
    */
   @property()
-  // @ts-ignore
   createdTime!: string;
 
   /**
    * 角色描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**

package/src/concepts/SelectMembers__.ts

@@ -8,32 +8,32 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import BatchAssignment from './BatchAssignment__';
-import AssignmentLine from './AssignmentLine__';
+import type BatchAssignment from './BatchAssignment__';
+import type AssignmentLine from './AssignmentLine__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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__';
+import type LogicItem from './LogicItem__';
 
 /**
  * 选择成员
  */
-@className
 @concept('选择成员')
-// @ts-ignore
 export class SelectMembers extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'SelectMembers';
+  static readonly ConceptName: string = 'SelectMembers';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -54,7 +54,6 @@ export class SelectMembers extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
@@ -162,6 +161,7 @@ export class SelectMembers extends BaseNode {
   _insertLogicItemAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'members' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
     if (!options) {
       logicItem = LogicItem.from(
@@ -181,7 +181,7 @@ export class SelectMembers extends BaseNode {
         this,
         'members',
       );
-    } else if (options instanceof LogicItem) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);

package/src/concepts/SequentialPolicy__.ts

@@ -0,0 +1,60 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 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 MultiApprovalPolicy from './MultiApprovalPolicy__';
+
+/**
+ * 依次审批
+ */
+@concept('依次审批')
+export class SequentialPolicy extends MultiApprovalPolicy {
+  /** 类名 */
+  static readonly ConceptName: string = 'SequentialPolicy';
+
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['MultiApprovalPolicy', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'SequentialPolicy';
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<SequentialPolicy>) {
+    source = Object.assign({}, SequentialPolicy.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): SequentialPolicy {
+    return super.from(source, parentNode, parentKey) as SequentialPolicy;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default SequentialPolicy;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Slot__.ts

@@ -3,28 +3,28 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 Param from './Param__';
-import ViewComponent from './ViewComponent__';
-import Module from './Module__';
-import App from './App__';
+import type Param from './Param__';
+import type ViewComponent from './ViewComponent__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 插槽
  */
-@className
 @concept('插槽')
-// @ts-ignore
 export class Slot extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Slot';
+  static readonly ConceptName: string = 'Slot';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -37,35 +37,30 @@ export class Slot extends BaseNode {
    * 插槽名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 插槽标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 插槽描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * emptyBackground
    */
   @property()
-  // @ts-ignore
   emptyBackground!: 'drag-entity-here';
 
   /**
    * 是否为高级功能，不在低代码中显示
    */
   @property()
-  // @ts-ignore
   advanced!: boolean;
 
   /**
@@ -74,7 +69,6 @@ export class Slot extends BaseNode {
   @property({
     objectRef: 'Param',
   })
-  // @ts-ignore
   slotProps!: Param;
 
   /**

package/src/concepts/SqlQueryComponent__.ts

@@ -9,37 +9,34 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
-import StructureProperty from './StructureProperty__';
-import Structure from './Structure__';
-import Identifier from './Identifier__';
-import MemberExpression from './MemberExpression__';
+import type StructureProperty from './StructureProperty__';
+import type Identifier from './Identifier__';
+import type MemberExpression from './MemberExpression__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 LogicItem from './LogicItem__';
+import type TypeAnnotation from './TypeAnnotation__';
 
 /**
  * SQL 查询
  */
-@className
 @concept('SQL 查询')
-// @ts-ignore
 export class SqlQueryComponent extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'SqlQueryComponent';
+  static readonly ConceptName: string = 'SqlQueryComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -58,7 +55,6 @@ export class SqlQueryComponent extends LogicItem {
    * SQL 查询
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**
@@ -67,21 +63,18 @@ export class SqlQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 数据源
    */
   @property()
-  // @ts-ignore
   dataSource!: string;
 
   /**
    * 查询组件的局部版本
    */
   @property()
-  // @ts-ignore
   ideVersion!: string;
 
   /**
@@ -187,6 +180,8 @@ export class SqlQueryComponent extends LogicItem {
     this._TsVariables = [];
     const str = this.code;
     const variables: Set<string> = new Set();
+    const Identifier = getConceptConstructor('Identifier');
+    const MemberExpression = getConceptConstructor('MemberExpression');
     let temp: any;
     const re = /\{(.+?)\}/g;
     while ((temp = re.exec(str))) {

package/src/concepts/Start__.ts

@@ -12,25 +12,24 @@ 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 LogicItem from './LogicItem__';
 
 /**
  * 开始节点
  */
-@className
 @concept('开始节点')
-// @ts-ignore
 export class Start extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Start';
+  static readonly ConceptName: string = 'Start';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/StaticString__.ts

@@ -0,0 +1,104 @@
+import type App from './App__';
+import type View from './View__';
+import type Frontend from './Frontend__';
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 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 BaseNode from '../common/BaseNode';
+
+/**
+ * 静态字符串
+ */
+@concept('静态字符串')
+export class StaticString extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName: string = 'StaticString';
+
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'StaticString';
+
+  /**
+   * 字符串的值
+   */
+  @property()
+  value: string = '';
+
+  /**
+   * i18nKey
+   */
+  @property()
+  i18nKey!: string;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<StaticString>) {
+    source = Object.assign({}, StaticString.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): StaticString {
+    return super.from(source, parentNode, parentKey) as StaticString;
+  }
+
+  /**
+   * 从父级删除该节点
+   * @internal
+   */
+  _delete() {
+    let params: Params = null;
+    if (this.parentNode) {
+      params = (this.parentNode as any)?.__removeStaticString?.(this);
+    }
+    return params;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+  /**
+   * 祖先 App
+   */
+  get app() {
+    return this.getAncestor('App') as App;
+  }
+  /**
+   * 祖先 View
+   */
+  get view() {
+    return this.getAncestor('View') as View;
+  }
+  /**
+   * 祖先 Frontend
+   */
+  get frontend() {
+    return this.getAncestor('Frontend') as Frontend;
+  }
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default StaticString;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/StringInterpolation__.ts

@@ -17,25 +17,24 @@ import { StringLiteral } from './StringLiteral__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 StringInterpolation extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'StringInterpolation';
+  static readonly ConceptName: string = 'StringInterpolation';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -111,6 +110,7 @@ export class StringInterpolation extends LogicItem {
   _insertItemAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'expressions' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
     if (!options) {
       logicItem = LogicItem.from(
@@ -130,7 +130,7 @@ export class StringInterpolation extends LogicItem {
         this,
         'expressions',
       );
-    } else if (options instanceof LogicItem) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -303,6 +303,7 @@ export class StringInterpolation extends LogicItem {
   }
 
   toVue(options?: ElementToVueOptions): string {
+    if (!this.expressions.length) return `''`;
     return this.expressions
       .map((exp: any) => {
         let expCode = exp.toVue();
@@ -321,14 +322,17 @@ export class StringInterpolation extends LogicItem {
     return this.expressions.map((exp) => exp.toUI(state, hideDetails)).join(' + ');
   }
 
-  toJS(): string {
+  toJS(state?: TranslatorState): string {
     if (!this.expressions.length) return `''`;
     return this.expressions
       .map((exp: any) => {
         const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
         transfromUnionTypeAnnotation(expTypeAnnotation, this.app);
         const { sortedTypeKey } = transfromMetadataType(expTypeAnnotation, this.app);
-        return `this.$utils['ToString']('${sortedTypeKey}', ${exp.toJS()})`;
+        if (state?.getVuePrototype) {
+          return `Vue.prototype.$utils['ToString']('${sortedTypeKey}', ${exp.toJS(state)})`;
+        }
+        return `this.$utils['ToString']('${sortedTypeKey}', ${exp.toJS(state)})`;
       })
       .join(' + ');
   }

package/src/concepts/StringLiteral__.ts

@@ -13,25 +13,24 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 StringLiteral extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'StringLiteral';
+  static readonly ConceptName: string = 'StringLiteral';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -50,7 +49,6 @@ export class StringLiteral extends LogicItem {
    * i18nKey
    */
   @property()
-  // @ts-ignore
   i18nKey!: string;
 
   /**
@@ -105,7 +103,7 @@ export class StringLiteral extends LogicItem {
     return code;
   }
 
-  toJS(): string {
+  toJS(state?: TranslatorState): string {
     let code = ``;
     if (this.i18nKey && this.frontend?.i18nInfo?.enabled) {
       if (this.frontend && !this.view) {