@lcap/nasl 3.7.3-beta.1 → 3.8.0-beta.2

package/src/concepts/CallLogic__.ts

@@ -744,7 +744,7 @@ export class CallLogic extends LogicItem {
       const namespaceArr = calleeNamespace.split('.');
       const start = namespaceArr[0];
       const isFrontendLibrary = ~calleeNamespace.indexOf('frontends');
-      if (start === 'app' || (start === 'extensions' && !isFrontendLibrary)) {
+      if (start === 'app' || (start === 'extensions' && !isFrontendLibrary) || this.isProcessV2Logic) {
         const keywordViewsIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'views');
         if (keywordViewsIndex === -1) {
           flag = false;
@@ -754,6 +754,13 @@ export class CallLogic extends LogicItem {
     return flag;
   }
 
+  // 是否来自于 前端依赖库
+  get isFrontendLibrary() {
+    const { calleeNamespace } = this;
+    const isFrontendLibrary = calleeNamespace?.startsWith('extensions') && calleeNamespace?.indexOf('frontends') > -1;
+    return isFrontendLibrary;
+  }
+
   // 是否属于组件逻辑
   get isComponentLogic() {
     // 组件逻辑
@@ -770,6 +777,13 @@ export class CallLogic extends LogicItem {
     return flag;
   }
 
+  /**
+   * 是否属于新流程逻辑
+   */
+  get isProcessV2Logic() {
+    return this.calleeNamespace === 'nasl.processV2';
+  }
+
   toJS(state?: TranslatorState): string {
     let code = '';
     if (this.getAncestor?.('DefaultValue')) {
@@ -781,6 +795,7 @@ export class CallLogic extends LogicItem {
     let extensionName = '';
 
     const { calleeName, calleeNamespace, isComponentLogic, completeArguments, isViewLogic, typeArguments } = this;
+    const completeTypeArguments = this.__TypeArguments?.length ? this.__TypeArguments :  typeArguments;
 
     const isShowArgument = (arg?: Argument) => {
       return arg?.expression;
@@ -801,10 +816,23 @@ export class CallLogic extends LogicItem {
         extensionName = namespaceArr[1];
       }
     }
-    // 全局逻辑
-    if (!isViewLogic) {
+    // 调用新流程逻辑
+    if (this.isProcessV2Logic) {
+      code += `this.$systemProcessV2['${this.calleeName}']`;
+      code += `({
+        body: {
+      `;
+      const argsStr = (this?.arguments || []).filter((obj) => obj?.expression)
+      .map((obj) => `\n${obj.keyword}: ${obj.expression?.toJS(state)}`)
+      .join(', ');
+      code += argsStr;
+
+      code += `}
+        })`;
+    } else if (!isViewLogic) { // 非页面逻辑
       const logic = this.getCallNode();
       const args = logic?.params || [];
+      const isSpreadFunc = args.some((arg) => arg.spread);
       const keywordEntitiesIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'entities');
 
       code += `this.$logics['${
@@ -931,20 +959,41 @@ export class CallLogic extends LogicItem {
         code += `path: {},
                 body: {`;
         if (!isProcessLogic) {
-          const argsStr = args
+          const formatArgs: Array<Param> = [...args];
+          let spreadParams = null;
+          // 如果是可变参数，需要先去掉最后一位可变参数位，在后面进行单独处理
+          if (isSpreadFunc) {
+            spreadParams = formatArgs.pop();
+          }
+          const argsStr = formatArgs
             .map((arg, index) => {
               const actualArg = completeArguments[index];
+              const keyword = arg?.name;
               return {
-                keyword: arg?.name,
+                keyword,
                 arg: actualArg,
               };
             })
-            .filter((item) => isShowArgument(item.arg))
+            .filter((item) => {
+              return isShowArgument(item.arg);
+            })
             .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toJS(state)}`)
             .join(', ');
           code += argsStr;
-          if (Array.isArray(typeArguments) && typeArguments.length) {
-            code += `,\n__typeArguments: ${JSON5.stringify(this.typeArguments)}`;
+          // 如果是可变参数，需要单独处理
+          if (isSpreadFunc) {
+            const spreadArg = completeArguments.slice(formatArgs.length);
+            const spreadArgStr = spreadArg
+              .filter((arg) => {
+                return isShowArgument(arg);
+              })
+              .map((arg) => arg?.toJS?.(state) || '')
+              .join(', ');
+            code += `,\n${spreadParams.name}: [${spreadArgStr}]`;
+          }
+
+          if (Array.isArray(completeTypeArguments) && completeTypeArguments.length) {
+            code += `,\n__typeArguments: ${JSON5.stringify(completeTypeArguments)}`;
           }
         }
         code += '\n}';
@@ -1146,10 +1195,12 @@ export class CallLogic extends LogicItem {
       typeArguments,
       tsCalleeNamespace,
       completeArguments,
+      needCompleteTypeArguments,
       parentNode,
       validation,
       useIife,
       useValidation,
+      completeTypeParams,
       arguments: logicArgs,
     } = self;
     /** 设置函数范型参数 */
@@ -1166,8 +1217,22 @@ export class CallLogic extends LogicItem {
         code += `>`;
       }
     };
+    /** 设置需要选择的函数范型参数 */
+    const setNeedCompleteTypeArguments = function* setNeedCompleteTypeArguments() {
+      // 如果有内容
+      if (needCompleteTypeArguments?.length) {
+        code += `<`;
+        yield* wrapForEach(needCompleteTypeArguments, function* warpForEachGenerator(arg, i, arr) {
+          code += yield* arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+          if (i !== arr.length - 1) {
+            code += ', ';
+          }
+        });
+        code += `>`;
+      }
+    };
     /** 设置输入参数 */
-    const setInputParam = function* setTypeArguments() {
+    const setInputParam = function* setInputParam() {
       let paramRequired = ['showMessage', 'consoleLog', 'jsonDeserialize', 'jsonSerialize'].includes(calleeName);
       if (
         ['expression'].includes(parentKey) &&
@@ -1252,6 +1317,28 @@ export class CallLogic extends LogicItem {
       }
     };
 
+    // 统一处理需要有泛型的 调用逻辑，其余的走老逻辑
+    if (completeTypeParams.length) {
+      code += '(() =>{';
+      code += '\nconst genericWrapper = ';
+      code += calleeKey;
+      yield* setInputParam();
+      code += ';\nconst warpperRes =';
+      code += 'genericWrapper';
+      yield* setNeedCompleteTypeArguments();
+      code += '();\nconst wrapper =';
+      if (handleError) {
+        code += 'nasl.util.autoTypeHandleError(';
+      }
+      code += 'warpperRes[0]';
+      if (handleError) {
+        code += ')';
+      }
+      code += ';\nreturn wrapper';
+      code += ';\n})()';
+      setEndSemi();
+      return code;
+    }
     if (!state.callLogicNoIife && self.isSpecificProcessLogic) {
       const procDefKey = self.arguments?.find((arg) => {
         return arg?.keyword === 'procDefKey';
@@ -1343,8 +1430,8 @@ export class CallLogic extends LogicItem {
 
     let code = '';
     let calleeKey = this.calleeKey.replace('__elements', '$refs');
-    // if (/^app.+?\.entities\..+?logics/.test(calleeKey))
-    //   calleeKey = calleeKey.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1Entity');
+    if (/^app.+?\.entities\..+?logics/.test(calleeKey))
+      calleeKey = calleeKey.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1Entity');
     /** 设置函数范型参数 */
     const setTypeArguments = () => {
       if (Array.isArray(typeArguments) && typeArguments.length) {
@@ -1521,7 +1608,16 @@ export class CallLogic extends LogicItem {
 
   /** 获取类型标注时的偏移量 */
   getQuickInfoOffset(range: Range, getCode: GetCode) {
-    if (this.useIife) {
+    if (this.completeTypeParams.length) {
+      const characterOffset = 7;
+      const code = getCode();
+      const lines = code.split('\n');
+      const lineOffset = lines.findIndex((item) => item.startsWith('const warpperRes'));
+      return {
+        line: range.start.line + lineOffset + 1,
+        offset: characterOffset,
+      };
+    } else if (this.useIife) {
       const characterOffset = 8;
       const code = getCode();
       const lines = code.split('\n');
@@ -1545,7 +1641,9 @@ export class CallLogic extends LogicItem {
    */
   enableValidation() {
     const calledLogic = this.getCallNode();
-    return Boolean(this.view) && calledLogic && !calledLogic.view;
+    // 调用依赖库且有泛型的都不展示， 因为不支持推导出来的泛型，或者选择的泛型参数支持选择
+    const moduleTypeLogic = this.calleeNamespace?.startsWith('extensions.') && calledLogic.completeTypeParams?.length;
+    return Boolean(this.view) && calledLogic && !calledLogic.view && !moduleTypeLogic;
   }
 
   // 可以设置默认值的节点
@@ -1556,14 +1654,26 @@ export class CallLogic extends LogicItem {
     const node = callArguments.length > 0 ? this.getCallNode() : undefined;
     const logicParams = node?.params ?? [];
 
+    // 判断是否有展开的参数
+    // 如果有展开参数，则可能出现 标注 形参 和实际 入参数不匹配的情况，需要特殊处理
+    const isSpreadFunc = logicParams.some((param) => param.spread);
+
     callArguments.forEach((arg, index) => {
       if (!arg) return;
-      const param = logicParams[index] || ({} as Param);
+      let param = logicParams[index] || ({} as Param);
+      if (index >= logicParams.length && isSpreadFunc) {
+        // 展开参数时，参数个数可能不匹配，这里需要特殊处理
+        // 强行指定为最后一个参数，因为可变参数只能放在最后
+        // && 超长参数使用当前自己的名称
+        param = logicParams[logicParams.length - 1];
+      } else {
+        // 强制更新当前的 keyword
+        arg.keyword = param?.name && param.name.length > 0 ? param.name : arg.keyword;
+      }
+      // 没有默认值，就是必填项
       arg.paramRequired = Boolean(!param?.defaultValue?.expression);
       arg.paramTypeAnnotation = undefined;
       arg.paramDefaultValue = undefined;
-      // 强制更新当前的 keyword
-      arg.keyword = param?.name && param.name.length > 0 ? param.name : arg.keyword;
       // 取到是不是必填放入参数中
       if (param && !arg.expression) {
         // 非必填时 才会有默认值
@@ -1575,6 +1685,33 @@ export class CallLogic extends LogicItem {
     return callArguments;
   }
 
+  // 推导泛型参数列表，目前只有在调用依赖库时才会有
+  __TypeArguments?: Array<TypeAnnotation> = [];
+  /**
+   * 获取 例如依赖库 等的  完整 声明的类型参数
+   */
+  get completeTypeParams() {
+    const node = this.typeArguments?.length ? this.getCallNode() : undefined;
+    const completeTypeParams = node?.completeTypeParams ?? [];
+    return completeTypeParams;
+  }
+
+  /**
+   * 获取需要用户手动选择的参数列表
+   * 如果没有声明参数但是本身有泛型参数列表，也直接输出出来
+   */
+  get needCompleteTypeArguments() {
+    if (this.completeTypeParams?.length) {
+      const typeArguments: TypeAnnotation[] = [];
+      this.completeTypeParams.forEach((typeParam, typeIndex) => {
+        if (typeParam.needChoose && this.typeArguments?.[typeIndex]) {
+          typeArguments.push(this.typeArguments?.[typeIndex]);
+        }
+      });
+      return typeArguments;
+    }
+    return this.typeArguments;
+  }
   static isSystem(node: CallLogic) {
     // 如此处需要更新，则需同时更新 menu-poppup 组件下的 includesSystemLogic 校验逻辑
     return ['nasl.process', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.io'].includes(

package/src/concepts/ConnectorLogic__.ts

@@ -25,7 +25,7 @@ export class ConnectorLogic extends Logic {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['Logic', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Logic', 'Annotatable', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/DatabaseTypeAnnotation__.ts

@@ -62,18 +62,7 @@ export class DatabaseTypeAnnotation extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-  @withSourceMap()
-  toNaturalTS(state = createCompilerState()): string {
-    return '';
-  }
 
-  @withSourceMap()
-  toTextualNASL(state = createCompilerState()): string {
-    let code = createDecoratorCode(state, this, ['typeName', 'arguments'], {
-      concept: true,
-    });
-    return code;
-  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/DepartmentManagerV2__.ts

@@ -0,0 +1,70 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
+
+import * as utils from '../utils';
+import { createUUID } from '../utils/create';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
+
+import ManagerV2 from './ManagerV2__';
+
+/**
+ * 部门主管
+ */
+@concept('部门主管')
+export class DepartmentManagerV2 extends ManagerV2 {
+  /** 类名 */
+  static readonly ConceptName: string = 'DepartmentManagerV2';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['ManagerV2', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'DepartmentManagerV2';
+  /**
+   * 是否从subordinate向上数
+   */
+  @property()
+  isUp: boolean;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<DepartmentManagerV2>) {
+    source = Object.assign({}, DepartmentManagerV2.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): DepartmentManagerV2 {
+    return super.from(source, parentNode, parentKey) as DepartmentManagerV2;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default DepartmentManagerV2;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/DepartmentV2__.ts

@@ -0,0 +1,75 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
+
+import * as utils from '../utils';
+import { createUUID } from '../utils/create';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
+import BaseNode from '../common/BaseNode';
+
+/**
+ * 部门用户
+ */
+@concept('部门用户')
+export class DepartmentV2 extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName: string = 'DepartmentV2';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'DepartmentV2';
+  /**
+   * 部门唯一标识
+   */
+  @property()
+  name: string;
+
+  /**
+   * 是否仅部门主管
+   */
+  @property()
+  managerOnly: boolean = false;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<DepartmentV2>) {
+    source = Object.assign({}, DepartmentV2.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): DepartmentV2 {
+    return super.from(source, parentNode, parentKey) as DepartmentV2;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default DepartmentV2;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/DirectManagerV2__.ts

@@ -0,0 +1,65 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
+
+import * as utils from '../utils';
+import { createUUID } from '../utils/create';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
+
+import ManagerV2 from './ManagerV2__';
+
+/**
+ * 直接主管
+ */
+@concept('直接主管')
+export class DirectManagerV2 extends ManagerV2 {
+  /** 类名 */
+  static readonly ConceptName: string = 'DirectManagerV2';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['ManagerV2', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'DirectManagerV2';
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<DirectManagerV2>) {
+    source = Object.assign({}, DirectManagerV2.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): DirectManagerV2 {
+    return super.from(source, parentNode, parentKey) as DirectManagerV2;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default DirectManagerV2;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/End__.ts

@@ -10,6 +10,8 @@ import {
 import type Return from './Return__';
 import type Logic from './Logic__';
 import type BusinessLogic from './BusinessLogic__';
+import type SubLogic from './SubLogic__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -66,7 +68,14 @@ export class End extends LogicItem {
 
   toJS(state?: TranslatorState): string {
     let code = '';
-    const logic = this.logic ?? (this.getAncestor('BusinessLogic') as BusinessLogic);
+    let logic: Logic | BusinessLogic | SubLogic;
+    // 子逻辑目前仅可能存在于 Logic 下，因此其上面也会挂载 this.logic
+    // 导致翻译错误，因此，需要进行短路处理
+    if (this.getAncestor('SubLogic')) {
+      logic = this.getAncestor('SubLogic') as SubLogic;
+    } else {
+      logic = this.logic ?? (this.getAncestor('BusinessLogic') as BusinessLogic);
+    }
     const ret = logic?.returns?.[0];
     if (ret) {
       code += `return ${ret.name};`;

package/src/concepts/EntityProperty__.ts

@@ -10,7 +10,6 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
-  createDescriptionComment,
 } from '../translator';
 import type CallQueryComponent from './CallQueryComponent__';
 
@@ -478,10 +477,6 @@ export class EntityProperty extends BaseNode {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
-
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['label', 'description']);
-    
     if (this.relationNamespace && this.relationEntity && this.relationProperty) {
       code += `@EntityRelation(() => new ${this.relationEntity}().${this.relationProperty})\n`;
       code += indent(state.tabSize);

package/src/concepts/Entity__.ts

@@ -11,7 +11,6 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
-  createDescriptionComment,
 } from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
 import type CallQueryComponent from './CallQueryComponent__';
@@ -29,15 +28,16 @@ import * as utils from '../utils';
 import { createUUID } from '../utils/create';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
-import BaseNode from '../common/BaseNode';
+
 import EntityProperty from './EntityProperty__';
 import EntityIndex from './EntityIndex__';
+import Annotatable from './Annotatable__';
 
 /**
  * 实体
  */
 @concept('实体')
-export class Entity extends BaseNode {
+export class Entity extends Annotatable {
   /** 类名 */
   static readonly ConceptName: string = 'Entity';
   /**
@@ -46,7 +46,7 @@ export class Entity extends BaseNode {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['Annotatable', 'BaseNode'];
 
   /**
    * 产品概念
@@ -837,11 +837,7 @@ export class Entity extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState(), entityName?: string): string {
-    let code = '';
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['description']);
-    code = `class ${this?.name} {\n`;
-
+    let code = `class ${this?.name} {\n`;
     this.properties.forEach((property) => {
       code += `${property.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }))};\n`;
     });