@lcap/nasl 3.4.0-beta.3 → 3.4.0-beta.4

package/src/concepts/ValidationRule__.ts

@@ -28,6 +28,9 @@ export class ValidationRule extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'ValidationRule';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -173,7 +176,7 @@ export class ValidationRule extends LogicItem {
           ...options,
         },
         this,
-        'arguments'
+        'arguments',
       );
     }
     this.arguments.splice(index, 0, argument);
@@ -321,7 +324,8 @@ export class ValidationRule extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -376,7 +380,9 @@ export class ValidationRule extends LogicItem {
         defaultError = defaultError.replace(`{args}`, `\${${this.arguments[index]?.toJS()}}`);
         index++;
       }
-      const itemTitle = (this?.parentNode as any)?.parentNode?.bindAttrs?.find((item: BindAttribute) => item.name === 'label');
+      const itemTitle = (this?.parentNode as any)?.parentNode?.bindAttrs?.find(
+        (item: BindAttribute) => item.name === 'label',
+      );
       let labelName;
       if (itemTitle?.expression?.toJS()) {
         labelName = `\${${itemTitle?.expression?.toJS()}}`;
@@ -424,7 +430,9 @@ export class ValidationRule extends LogicItem {
         defaultError = defaultError.replace(`{args}`, `\${${this.arguments[index]?.toVue(options)}}`);
         index++;
       }
-      const itemTitle = (this?.parentNode as any)?.parentNode?.bindAttrs?.find((item: BindAttribute) => item.name === 'label');
+      const itemTitle = (this?.parentNode as any)?.parentNode?.bindAttrs?.find(
+        (item: BindAttribute) => item.name === 'label',
+      );
       let labelName;
       if (itemTitle?.expression?.toVue()) {
         labelName = `\${${itemTitle?.expression?.toVue()}}`;
@@ -445,7 +453,7 @@ export class ValidationRule extends LogicItem {
     return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = this.calleeName;
     if (this.arguments?.length) {
       code += '(';
@@ -554,7 +562,7 @@ export class ValidationRule extends LogicItem {
         {
           keyword: param.name,
         },
-        this
+        this,
       );
       Object.assign(argument, relationOptions);
       return argument;
@@ -589,9 +597,15 @@ export class ValidationRule extends LogicItem {
     const arr: {}[] = [];
     // 获取所有的默认错误信息
     Object.keys(defaultErrorMessage).forEach((key) => {
+      let zhString = (defaultErrorMessage as any)[key] as string;
+      if (key === 'rangeLength') {
+          zhString = '字符数量在{args}之间';
+      } else if (key === 'range') {
+          zhString = '范围在{args}之间';
+      }
       arr.push({
         id: this.i18nKeyPrefix + key,
-        'zh-CN': (defaultErrorMessage as any)[key] as string,
+        'zh-CN': zhString,
         i18nKey: this.i18nKeyPrefix + key,
       });
     });

package/src/concepts/Variable__.ts

@@ -50,6 +50,9 @@ export class Variable extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Variable';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -240,7 +243,8 @@ export class Variable extends BaseNode {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -292,7 +296,8 @@ export class Variable extends BaseNode {
       // @ts-ignore
       const n = defaultValue.__v_raw || defaultValue;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -318,7 +323,7 @@ export class Variable extends BaseNode {
     return this.name;
   }
 
-  toUI(): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     return this.name;
   }
 
@@ -355,7 +360,7 @@ export class Variable extends BaseNode {
     }
     if (
       this.defaultValue?.expression &&
-      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(this.defaultValue?.expression?.toEmbeddedTS())
+      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(this.defaultValue?.toEmbeddedTS())
     ) {
       if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation?.typeKey)) {
         code += this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
@@ -510,6 +515,7 @@ export class Variable extends BaseNode {
     // 切换类型的时候如果有默认值就清除掉
     if (this.defaultValue) {
       object.defaultValue = null;
+      this.updateRelyFileNode(this.app);
     }
 
     return this.update({

package/src/concepts/ViewBlock__.ts

@@ -19,6 +19,9 @@ export class ViewBlock extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ViewBlock';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */

package/src/concepts/ViewComponent__.ts

@@ -26,6 +26,9 @@ export class ViewComponent extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ViewComponent';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -1125,7 +1128,8 @@ export class ViewComponent extends BaseNode {
       // @ts-ignore
       const n = attribute.__v_raw || attribute;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1177,7 +1181,8 @@ export class ViewComponent extends BaseNode {
       // @ts-ignore
       const n = event.__v_raw || event;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1229,7 +1234,8 @@ export class ViewComponent extends BaseNode {
       // @ts-ignore
       const n = slot.__v_raw || slot;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1281,7 +1287,8 @@ export class ViewComponent extends BaseNode {
       // @ts-ignore
       const n = logic.__v_raw || logic;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1333,7 +1340,8 @@ export class ViewComponent extends BaseNode {
       // @ts-ignore
       const n = viewComponent.__v_raw || viewComponent;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1385,7 +1393,8 @@ export class ViewComponent extends BaseNode {
       // @ts-ignore
       const n = viewBlock.__v_raw || viewBlock;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/ViewElement__.ts

@@ -260,6 +260,9 @@ export class ViewElement extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ViewElement';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -1266,7 +1269,8 @@ export class ViewElement extends BaseNode {
       // @ts-ignore
       const n = bindAttribute.__v_raw || bindAttribute;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1318,7 +1322,8 @@ export class ViewElement extends BaseNode {
       // @ts-ignore
       const n = bindEvent.__v_raw || bindEvent;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1370,7 +1375,8 @@ export class ViewElement extends BaseNode {
       // @ts-ignore
       const n = bindDirective.__v_raw || bindDirective;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1422,7 +1428,8 @@ export class ViewElement extends BaseNode {
       // @ts-ignore
       const n = bindStyle.__v_raw || bindStyle;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1474,7 +1481,8 @@ export class ViewElement extends BaseNode {
       // @ts-ignore
       const n = viewElement.__v_raw || viewElement;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/View__.ts

@@ -11,6 +11,8 @@ import BatchAssignment from './BatchAssignment__';
 import CallInterface from './CallInterface__';
 import CallLogic from './CallLogic__';
 import DefaultValue from './DefaultValue__';
+import type Interface from './Interface__';
+
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -41,6 +43,9 @@ export class View extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'View';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -1249,7 +1254,8 @@ export class View extends BaseNode {
       // @ts-ignore
       const n = viewElement.__v_raw || viewElement;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1301,7 +1307,8 @@ export class View extends BaseNode {
       // @ts-ignore
       const n = param.__v_raw || param;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1353,7 +1360,8 @@ export class View extends BaseNode {
       // @ts-ignore
       const n = variable.__v_raw || variable;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1405,7 +1413,8 @@ export class View extends BaseNode {
       // @ts-ignore
       const n = logic.__v_raw || logic;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1457,7 +1466,8 @@ export class View extends BaseNode {
       // @ts-ignore
       const n = bindEvent.__v_raw || bindEvent;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1509,7 +1519,8 @@ export class View extends BaseNode {
       // @ts-ignore
       const n = view.__v_raw || view;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1737,8 +1748,6 @@ export class View extends BaseNode {
           );
           this.addBindEvent(event);
         } else {
-          const index = bindEvent.logics.length;
-          newLogic.name += index;
           bindEvent.addLogic(newLogic);
         }
       });
@@ -1762,6 +1771,13 @@ export class View extends BaseNode {
     if (Array.isArray(this.logics)) {
       varList.push(...this.logics);
     }
+    if (Array.isArray(this.bindEvents)) {
+      this.bindEvents.forEach((bindEvent) => {
+        if (Array.isArray(bindEvent.logics)) {
+          varList.push(...bindEvent.logics);
+        }
+      });
+    }
     return varList.filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
 
@@ -2066,7 +2082,7 @@ export class View extends BaseNode {
     }
     if (Array.isArray(this.variables)) {
       this.variables.forEach((variable) => {
-        const ts = variable.defaultValue?.expression?.toEmbeddedTS();
+        const ts = variable.defaultValue?.toEmbeddedTS();
         if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
           IDENTIFIERMAP.add(variable);
         }
@@ -2232,7 +2248,7 @@ export class View extends BaseNode {
     /* 参数的默认值是__IDENTIFIER__或者__IDENTIFIER__()时不赋默认值，但是需要ts翻译出来进行报错校验 */
     IDENTIFIERMAP.forEach((node: Variable) => {
       code += `${indent((state?.tabSize || 0) + 2)}`;
-      code += node.defaultValue.expression.toEmbeddedTS(shiftState(state, code, { inline: true }));
+      code += node.defaultValue.toEmbeddedTS(shiftState(state, code, { inline: true }));
       code += '; ';
     });
     code += '\n';
@@ -2645,7 +2661,7 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     // 调用接口，参数替换成 null
     if (rightNode instanceof CallInterface) {
       const { _interface } = rightNode.getModuleInterface();
-      return _interface ? `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})` : null;
+      return _interface ? `${rightNode.tsCalleeKey}(${(_interface as Interface).params.map(() => 'null').join(',')})` : null;
     }
 
     // 调用服务端逻辑，参数替换成 null

package/src/concepts/WhileStatement__.ts

@@ -21,6 +21,9 @@ export class WhileStatement extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'WhileStatement';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -227,7 +230,8 @@ export class WhileStatement extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -322,6 +326,8 @@ export class WhileStatement extends LogicItem {
           }),
         )};\n`;
       });
+      if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
+        code += `${indent(state.tabSize + 1)}// 当前位置\n`;
     }
 
     code += `${indent(state.tabSize)}}\n`;

package/src/concepts/basics/constants.ts

@@ -0,0 +1,2 @@
+// 编辑态自定义连接器后缀
+export const CUSTOM_CONNECTOR_EDITABLE_SUFFIX = '__Editable';

package/src/concepts/basics/stdlib/nasl.util.ts

@@ -382,12 +382,12 @@ export default new Namespace({
             params: [
                 new Param({
                     name: 'str1',
-                    description: '指定字符串1',
+                    description: '指定参数1，按照字符串方式拼接',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
                 }),
                 new Param({
                     name: 'str2',
-                    description: '指定字符串2',
+                    description: '指定参数2，按照字符串方式拼接',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
                 }),
             ],
@@ -1521,7 +1521,7 @@ export default new Namespace({
         }),
         new Function({
             name: 'Clear',
-            description: '（修改原数据）清除复杂对象数据（不支持清除 Integer 等基础类型的值）',
+            description: '（修改原数据）清除复杂对象中每个属性的数据（若输入是单个基础类型如 Integer 的值，则不做处理）',
             params: [
                 new Param({
                     name: 'struct',

package/src/concepts/index__.ts

@@ -31,6 +31,7 @@ export * from './Logic__';
 export * from './AuthLogic__';
 export * from './AuthLogicForCallInterface__';
 export * from './OverriddenLogic__';
+export * from './AbstractInterface__';
 export * from './Param__';
 export * from './Return__';
 export * from './Variable__';
@@ -41,6 +42,7 @@ export * from './LogicItem__';
 export * from './Function__';
 export * from './AnonymousFunction__';
 export * from './Interface__';
+export * from './InterfaceFromExample__';
 export * from './InterfaceParam__';
 export * from './Transactional__';
 export * from './DefaultValue__';

package/src/concepts/types__.ts

@@ -31,6 +31,7 @@ import type { Logic } from './Logic__';
 import type { AuthLogic } from './AuthLogic__';
 import type { AuthLogicForCallInterface } from './AuthLogicForCallInterface__';
 import type { OverriddenLogic } from './OverriddenLogic__';
+import type { AbstractInterface } from './AbstractInterface__';
 import type { Param } from './Param__';
 import type { Return } from './Return__';
 import type { Variable } from './Variable__';
@@ -41,6 +42,7 @@ import type { LogicItem } from './LogicItem__';
 import type { Function } from './Function__';
 import type { AnonymousFunction } from './AnonymousFunction__';
 import type { Interface } from './Interface__';
+import type { InterfaceFromExample } from './InterfaceFromExample__';
 import type { InterfaceParam } from './InterfaceParam__';
 import type { Transactional } from './Transactional__';
 import type { DefaultValue } from './DefaultValue__';
@@ -157,6 +159,7 @@ export type SyntaxNode =
     | AuthLogic
     | AuthLogicForCallInterface
     | OverriddenLogic
+    | AbstractInterface
     | Param
     | Return
     | Variable
@@ -167,6 +170,7 @@ export type SyntaxNode =
     | Function
     | AnonymousFunction
     | Interface
+    | InterfaceFromExample
     | InterfaceParam
     | Transactional
     | DefaultValue

package/src/decorators/index.ts

@@ -23,13 +23,28 @@ type conceptMeta = {
 
 type ConceptMap = Map<string, conceptMeta>;
 
+type InterfaceMeta = {
+  implements?: string[];
+  extends?: string[];
+};
+
 export const conceptMap: ConceptMap = new Map();
 export const classMap = new Map<string, { new (...args: any[]): any }>;
+export const interfaceMap = new Map<string, InterfaceMeta>();
 
 export function className(target: any) {
   classMap.set(target.ConceptName, target);
 }
 
+export function getInterfaceMeta(concept: string): InterfaceMeta {
+  let interfaceMeta = interfaceMap.get(concept);
+  if (!interfaceMeta) {
+    interfaceMeta = {};
+    interfaceMap.set(concept, interfaceMeta);
+  }
+  return interfaceMeta;
+}
+
 export function getConceptMeta(concept: string): conceptMeta {
   let conceptMeta: conceptMeta = conceptMap.get(concept);
   if (!conceptMeta) {
@@ -72,6 +87,46 @@ export function concept(nodeTitle: string) {
   };
 }
 
+export function imps(interfaces: string[]) {
+  return (target: any) => {
+    if (Array.isArray(interfaces)) {
+      interfaces.forEach((interfaceName) => {
+        setIterfaceInheritance(interfaceName, {
+          implementsBy: target.ConceptName ?? target.name
+        });
+      });
+    }
+  };
+}
+
+export function interfaceExtends(interfaceName: string, extendsBy: string) {
+  setIterfaceInheritance(interfaceName, {
+    extendsBy,
+  });
+}
+
+export function setIterfaceInheritance(interfaceName: string, {
+  implementsBy,
+  extendsBy,
+}: {
+  implementsBy?: string
+  extendsBy?: string
+}) {
+  const metaMap = getInterfaceMeta(interfaceName);
+  if (implementsBy) {
+    if (!metaMap.implements) {
+      metaMap.implements = [];
+    }
+    metaMap.implements.push(implementsBy);
+  }
+  if (extendsBy) {
+    if (!metaMap.extends) {
+      metaMap.extends = [];
+    }
+    metaMap.extends.push(extendsBy);
+  }
+}
+
 export function property(params?: any) {
   const { objectRef, isArray, defaultValue } = params || {};
   return function handle(target: SyntaxNode | BaseNode, key: string) {

package/src/enums/KEYWORDS.ts

@@ -37,6 +37,8 @@ export const KEYWORDS = [
   'constructor',
   'continue',
   'core',
+  // 由于 connector 作为了 连接器相关的 namespace 前缀，因此 connector 作为关键字
+  'connector',
   'dataSet',
   'dataSource',
   'database',

package/src/generator/genBundleFiles.ts

@@ -461,21 +461,21 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
             curParentHID = incrementID;
         });
         window.addEventListener('popstate', function (e) {
-            if(curHID > e.state?.HID){
+            if(curHID > (e.state ? e.state.HID : undefined)){
                 isBack = true;
             } else {
                 isForward = true;
             }
             // 更新当前历史ID
-            curHID = e.state?.HID || 0;
+            curHID = e.state? e.state.HID : 0;
         });
         // 顶层页面路由回退时，需要同步 iframe 的路由
         window.parent.addEventListener('popstate', function (e) {
-            if(curParentHID > e.state?.HID){
+            if(curParentHID > (e.state ? e.state.HID : undefined)){
                 appVM.$router.back();
             }
             // 更新当前顶层历史ID
-            curParentHID = e.state?.HID || 0;
+            curParentHID = (e.state ? e.state.HID : undefined) || 0;
         });
         // 首次加载同步 title 和 shortcut icon
         window.addEventListener('load', function() {
@@ -483,10 +483,10 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
             const shortcutIconLink = document.querySelector('link[rel="shortcut icon"]');
             if(shortcutIconLink) parent.document.head.appendChild(shortcutIconLink);
         });
-        `
-    }
+        `;
+  }
 
-    content += `
+  content += `
     })();`;
 
   if (config.env === 'dev') {

package/src/generator/genMetaData.ts

@@ -17,6 +17,7 @@ import {
   Frontend,
   authStructures,
   httpStructures,
+  InterfaceFromExample,
 } from '../concepts';
 import * as utils from '../utils';
 
@@ -95,7 +96,7 @@ export function genMetaData(app: App, frontend: Frontend) {
     module.structures && structures.push(...module.structures);
     module.enums && enums.push(...module.enums);
     module.logics && logics.push(...module.logics);
-    module.interfaces && interfaces.push(...module.interfaces);
+    module.interfaces && interfaces.push(...module.interfaces as Interface[]);
     if (Array.isArray(module.dataSources)) {
       module.dataSources.forEach((dataSource) => {
         if (Array.isArray(dataSource.entities)) {
@@ -253,7 +254,11 @@ export function genMetaData(app: App, frontend: Frontend) {
     }
   });
 
-  interfaces.forEach((interfaceItem: Interface) => {
+  interfaces.forEach((interfaceItem: Interface | InterfaceFromExample) => {
+    // 兼容 InterfaceFromExample
+    if (interfaceItem instanceof InterfaceFromExample) {
+      interfaceItem = interfaceItem.inter;
+    }
     _custom[`${interfaceItem.getNamespace()}.${interfaceItem.name}`] = interfaceItem.toService();
   });