@lcap/nasl 3.4.0-alpha.1 → 3.4.0-alpha.2

package/out/concepts/LogicItem__.d.ts

@@ -17,10 +17,12 @@ import Connector from './Connector__';
  * 逻辑项
  */
 export declare class LogicItem extends BaseNode {
+    /** 类名 */
+    static readonly ConceptName = "LogicItem";
     /**
      * 产品概念
      */
-    concept: 'LogicItem' | 'AnonymousFunction' | 'Abort' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallConnector' | 'CallFunction' | 'CallInterface' | 'CallAuthInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'JavaLogic' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes';
+    readonly concept: 'LogicItem' | 'AnonymousFunction' | 'Abort' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallConnector' | 'CallFunction' | 'CallInterface' | 'CallAuthInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'JavaLogic' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes';
     /**
      * 逻辑项标题
      */
@@ -89,7 +91,6 @@ export declare class LogicItem extends BaseNode {
      * @param source 需要合并的部分参数
      */
     constructor(source?: Partial<LogicItem>);
-    getClassName(): string;
     static from(source: any, parentNode?: any, parentKey?: string): LogicItem;
     /**
      * 从父级删除该节点

package/out/concepts/LogicItem__.js

@@ -14,23 +14,29 @@ exports.LogicItem = void 0;
 const translator_1 = require("../translator");
 const decorators_1 = require("../decorators");
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
-const classMap_1 = __importDefault(require("../common/classMap"));
 /**
  * 逻辑项
  */
-let LogicItem = LogicItem_1 = class LogicItem extends BaseNode_1.default {
+let LogicItem = LogicItem_1 = 
+// @ts-ignore
+class LogicItem extends BaseNode_1.default {
+    /** 类名 */
+    static ConceptName = 'LogicItem';
     /**
      * 产品概念
      */
-    concept = 'LogicItem';
+    // @ts-ignore
+    concept;
     /**
      * 逻辑项标题
      */
-    label = undefined;
+    // @ts-ignore
+    label;
     /**
      * 逻辑项描述
      */
-    description = undefined;
+    // @ts-ignore
+    description;
     /**
      * 是否折叠
      */
@@ -38,11 +44,13 @@ let LogicItem = LogicItem_1 = class LogicItem extends BaseNode_1.default {
     /**
      * offsetX
      */
-    offsetX = undefined;
+    // @ts-ignore
+    offsetX;
     /**
      * offsetY
      */
-    offsetY = undefined;
+    // @ts-ignore
+    offsetY;
     /**
      * 祖先 OverriddenLogic
      */
@@ -113,14 +121,10 @@ let LogicItem = LogicItem_1 = class LogicItem extends BaseNode_1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        // @ts-ignore
-        source = { ...LogicItem_1.getDefaultOptions(), ...source };
+        source = Object.assign({}, LogicItem_1.getDefaultOptions(), source);
         super(source);
         super.subConstructor(source);
     }
-    getClassName() {
-        return 'LogicItem';
-    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -168,10 +172,10 @@ let LogicItem = LogicItem_1 = class LogicItem extends BaseNode_1.default {
             ...object,
         });
     }
-    //= ===============================================================================
+    //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //= ===============================================================================
+    //================================================================================
     get completeName() {
         return this.name;
     }
@@ -253,9 +257,6 @@ let LogicItem = LogicItem_1 = class LogicItem extends BaseNode_1.default {
         this.app?.emit('collect:end');
     }
 };
-__decorate([
-    (0, decorators_1.property)()
-], LogicItem.prototype, "concept", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], LogicItem.prototype, "label", void 0);
@@ -272,13 +273,14 @@ __decorate([
     (0, decorators_1.property)()
 ], LogicItem.prototype, "offsetY", void 0);
 LogicItem = LogicItem_1 = __decorate([
+    decorators_1.className,
     (0, decorators_1.concept)('逻辑项')
+    // @ts-ignore
 ], LogicItem);
 exports.LogicItem = LogicItem;
-classMap_1.default.LogicItem = LogicItem;
 exports.default = LogicItem;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================
 //# sourceMappingURL=LogicItem__.js.map

package/out/concepts/LogicItem__.js.map

@@ -1 +1 @@
-{"version":3,"file":"LogicItem__.js","sourceRoot":"","sources":["../../src/concepts/LogicItem__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LogicItem__.js","sourceRoot":"","sources":["../../src/concepts/LogicItem__.ts"],"names":[],"mappings":"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"}

package/out/concepts/Logic__.d.ts

@@ -22,43 +22,40 @@ import Process from './Process__';
  * 逻辑
  */
 export declare class Logic extends BaseNode {
+    /** 类名 */
+    static readonly ConceptName = "Logic";
     /**
      * 产品概念
      */
-    concept: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface';
+    readonly concept: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface';
     /**
      * 逻辑名称
      */
     name: string;
+    /**
+     * 逻辑标题
+     */
+    title: string;
     /**
      * 逻辑描述
      */
     description: string;
     /**
-     * triggerType
+     * 触发方式
      */
     triggerType: string;
     /**
-     * cron
+     * 定时任务表达式
      */
     cron: string;
     /**
-     * overridable
+     * 是否可覆写
      */
     overridable: boolean;
     /**
      * 事务
      */
     transactional: Transactional;
-    /**
-     * 编译器信息
-     */
-    compilerInfoMap: {
-        java?: {
-            packageName: string;
-            className: string;
-        };
-    };
     /**
      * 类型参数列表
      */
@@ -115,7 +112,6 @@ export declare class Logic extends BaseNode {
      * @param source 需要合并的部分参数
      */
     constructor(source?: Partial<Logic>);
-    getClassName(): string;
     static from(source: any, parentNode?: any, parentKey?: string): Logic;
     /**
      * 从父级删除该节点
@@ -126,20 +122,24 @@ export declare class Logic extends BaseNode {
      * 设置逻辑名称
      */
     setName(name: string): void;
+    /**
+     * 设置逻辑标题
+     */
+    setTitle(title: string): void;
     /**
      * 设置逻辑描述
      */
     setDescription(description: string): void;
     /**
-     * 设置triggerType
+     * 设置触发方式
      */
     setTriggerType(triggerType: string): void;
     /**
-     * 设置cron
+     * 设置定时任务表达式
      */
     setCron(cron: string): void;
     /**
-     * 设置overridable
+     * 设置是否可覆写
      */
     setOverridable(overridable: boolean): void;
     /**

package/out/concepts/Logic__.js

@@ -49,7 +49,6 @@ const CallLogic__1 = __importDefault(require("./CallLogic__"));
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
-const classMap_1 = __importDefault(require("../common/classMap"));
 const Transactional__1 = __importDefault(require("./Transactional__"));
 const TypeParam__1 = __importDefault(require("./TypeParam__"));
 const Param__1 = __importDefault(require("./Param__"));
@@ -60,39 +59,51 @@ const Process__1 = __importDefault(require("./Process__"));
 /**
  * 逻辑
  */
-let Logic = Logic_1 = class Logic extends BaseNode_1.default {
+let Logic = Logic_1 = 
+// @ts-ignore
+class Logic extends BaseNode_1.default {
+    /** 类名 */
+    static ConceptName = 'Logic';
     /**
      * 产品概念
      */
-    concept = 'Logic';
+    // @ts-ignore
+    concept;
     /**
      * 逻辑名称
      */
-    name = undefined;
+    // @ts-ignore
+    name;
     /**
-     * 逻辑描述
+     * 逻辑标题
      */
-    description = undefined;
+    // @ts-ignore
+    title;
     /**
-     * triggerType
+     * 逻辑描述
      */
-    triggerType = undefined;
+    // @ts-ignore
+    description;
     /**
-     * cron
+     * 触发方式
      */
-    cron = undefined;
+    // @ts-ignore
+    triggerType;
     /**
-     * overridable
+     * 定时任务表达式
      */
-    overridable = undefined;
+    // @ts-ignore
+    cron;
     /**
-     * 事务
+     * 是否可覆写
      */
-    transactional = undefined;
+    // @ts-ignore
+    overridable;
     /**
-     * 编译器信息
+     * 事务
      */
-    compilerInfoMap = undefined;
+    // @ts-ignore
+    transactional;
     /**
      * 类型参数列表
      */
@@ -163,14 +174,10 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        // @ts-ignore
-        source = { ...Logic_1.getDefaultOptions(), ...source };
+        source = Object.assign({}, Logic_1.getDefaultOptions(), source);
         super(source);
         super.subConstructor(source);
     }
-    getClassName() {
-        return 'Logic';
-    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -197,6 +204,17 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             field: 'name',
         });
     }
+    /**
+     * 设置逻辑标题
+     */
+    setTitle(title) {
+        const object = {
+            title,
+        };
+        this.update({
+            ...object,
+        });
+    }
     /**
      * 设置逻辑描述
      */
@@ -209,7 +227,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         });
     }
     /**
-     * 设置triggerType
+     * 设置触发方式
      */
     setTriggerType(triggerType) {
         const object = {
@@ -220,7 +238,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         });
     }
     /**
-     * 设置cron
+     * 设置定时任务表达式
      */
     setCron(cron) {
         const object = {
@@ -231,7 +249,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         });
     }
     /**
-     * 设置overridable
+     * 设置是否可覆写
      */
     setOverridable(overridable) {
         const object = {
@@ -570,7 +588,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             transactional = this.transactional;
             if (!transactional) {
-                throw new Error(`找不到事务 ${options}`);
+                throw new Error('找不到事务 ' + options);
             }
         }
         else {
@@ -579,7 +597,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return transactional.delete();
     }
     __removeTransactional(transactional) {
-        const { parentKey } = transactional;
+        const parentKey = transactional.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -606,7 +624,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             typeParam = this.typeParams.find((item) => item.name === options);
             if (!typeParam) {
-                throw new Error(`找不到类型参数 ${options}`);
+                throw new Error('找不到类型参数 ' + options);
             }
         }
         else {
@@ -615,7 +633,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return typeParam.delete();
     }
     __removeTypeParam(typeParam) {
-        const { parentKey } = typeParam;
+        const parentKey = typeParam.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -642,7 +660,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             param = this.params.find((item) => item.name === options);
             if (!param) {
-                throw new Error(`找不到输入参数 ${options}`);
+                throw new Error('找不到输入参数 ' + options);
             }
         }
         else {
@@ -651,7 +669,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return param.delete();
     }
     __removeParam(param) {
-        const { parentKey } = param;
+        const parentKey = param.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -678,7 +696,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             ret = this.returns.find((item) => item.name === options);
             if (!ret) {
-                throw new Error(`找不到输出参数 ${options}`);
+                throw new Error('找不到输出参数 ' + options);
             }
         }
         else {
@@ -687,7 +705,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return ret.delete();
     }
     __removeReturn(ret) {
-        const { parentKey } = ret;
+        const parentKey = ret.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -714,7 +732,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             variable = this.variables.find((item) => item.name === options);
             if (!variable) {
-                throw new Error(`找不到变量 ${options}`);
+                throw new Error('找不到变量 ' + options);
             }
         }
         else {
@@ -723,7 +741,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return variable.delete();
     }
     __removeVariable(variable) {
-        const { parentKey } = variable;
+        const parentKey = variable.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -746,15 +764,15 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return params;
     }
     removeItemInBody(options) {
-        const logicItem = options;
+        let logicItem = options;
         return logicItem.delete();
     }
     removeItemInPlayground(options) {
-        const logicItem = options;
+        let logicItem = options;
         return logicItem.delete();
     }
     __removeLogicItem(logicItem) {
-        const { parentKey } = logicItem;
+        const parentKey = logicItem.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -776,10 +794,10 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         }
         return params;
     }
-    //= ===============================================================================
+    //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //= ===============================================================================
+    //================================================================================
     // 用于calllogic树中定位是那个logic，回显
     get calleewholeKey() {
         return `${this.getNamespace()}.${this.name}`;
@@ -835,6 +853,8 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             varList.push(...this.variables);
         }
         if (this.view) {
+            // 页面下，变量名不可以跟逻辑名相同，会有js 翻译问题
+            varList.push(this);
             if (Array.isArray(this.view.params)) {
                 varList.push(...this.view.params);
             }
@@ -1032,7 +1052,9 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                     code += 'const __LogicEmpty: any = null;';
                 }
             }
-            else if (this.body.length <= 2 && !(this.parentNode instanceof Namespace__1.default) && !(this.parentNode instanceof Process__1.default)) {
+            else if (this.body.length <= 2 &&
+                !(this.parentNode instanceof Namespace__1.default) &&
+                !(this.parentNode instanceof Process__1.default)) {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
                 code += `${(0, translator_1.indent)(state?.tabSize || 0 + 4)}const __LogicEmpty: any = null;`;
             }
@@ -1179,7 +1201,9 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                         ? assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
                         : assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                     if (leftCode === node.name) {
-                        const rightNode = rightIndex.length === 1 ? assignment.rights[rightIndex[0]]?.expression : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
+                        const rightNode = rightIndex.length === 1
+                            ? assignment.rights[rightIndex[0]]?.expression
+                            : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
                         // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
                         if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent__1.default && !rightNode.isAutoInfer())) {
                             if (rightNode.concept === 'NewComposite' && rightNode.typeAnnotation?.typeKind === 'anonymousStructure') {
@@ -1203,17 +1227,20 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                     }
                 });
             }
-            else if (['NewList', 'NewMap'].includes(assignment.right?.concept) && !assignment.right?.typeAnnotation) {
+            else if (['NewList', 'NewMap'].includes(assignment.right?.concept) &&
+                !assignment.right?.typeAnnotation) {
                 const rightNode = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
             }
-            else if (assignment.right?.concept === 'NewComposite' && assignment.right?.typeAnnotation?.typeKind === 'anonymousStructure') {
+            else if (assignment.right?.concept === 'NewComposite' &&
+                assignment.right?.typeAnnotation?.typeKind === 'anonymousStructure') {
                 const rightNode = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
             }
-            else if (assignment.right?.concept === 'NewComposite' && assignment.right?.typeAnnotation?.typeKind === 'generic') {
+            else if (assignment.right?.concept === 'NewComposite' &&
+                assignment.right?.typeAnnotation?.typeKind === 'generic') {
                 const rightNode = assignment.right;
                 code += ' = ';
                 code += rightNode.getNewCompositeCode((0, translator_1.shiftState)(state, code, { inline: true }));
@@ -1229,10 +1256,16 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                     code += ' = ';
                     let rightCode = '';
                     // 因为右侧枚举要赋值就得new 一下；
-                    if (rightNode && rightNode instanceof Identifier__1.default && rightNode.namespace && rightNode.namespace.endsWith('enums')) {
+                    if (rightNode &&
+                        rightNode instanceof Identifier__1.default &&
+                        rightNode.namespace &&
+                        rightNode.namespace.endsWith('enums')) {
                         rightCode += 'new ';
                     }
-                    rightCode += rightNode && rightNode.toEmbeddedTS ? rightNode.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : '__RIGHT__';
+                    rightCode +=
+                        rightNode && rightNode.toEmbeddedTS
+                            ? rightNode.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                            : '__RIGHT__';
                     code += this.getRightCode(rightCode, assignment, rightNode);
                 }
             }
@@ -1501,6 +1534,11 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
                 return parentNamespace;
             }
             const parentName = this.parentNode.name;
+            // 自定义连接器，增加了分组概念，故需要额外扩展一层namespace
+            const connector = this.getAncestor('Connector');
+            if (connector && connector.connectorKind === 'app') {
+                return `${parentNamespace}.${parentName}`;
+            }
             const arr = [parentNamespace];
             if (this.parentNode.concept !== 'App' && parentName) {
                 arr.push(parentName);
@@ -1528,6 +1566,8 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
     getTsNamespace() {
         if (this.parentNode) {
             const parentNamespace = this.parentNode?.getTsNamespace();
+            // 对于parent类型为Namespace的情况，getTsNamespace 已经返回了具体的 name，
+            // 为什么下文还要重新获取？？？
             const parentName = this.parentNode.tsName || this.parentNode.name;
             const arr = [parentNamespace];
             if (this.parentNode.concept !== 'App' && parentName) {
@@ -1562,7 +1602,13 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
             _path = `/${this.module.parentKey}/${this.module.name}`;
         }
         else if (this.connector) {
-            _path = `/${this.connector.parentKey}/${this.connector.name}`;
+            // 自定义连接器有分组的概念因此，需要做文件夹处理
+            if (this.connector.connectorKind === 'app') {
+                _path = `/${this.connector.parentKey}/${this.connector.name}/${this.parentNode.name}`;
+            }
+            else {
+                _path = `/${this.connector.parentKey}/${this.connector.name}`;
+            }
         }
         if (this.parentNode instanceof FrontendLibrary__1.FrontendLibrary) {
             _path += `/frontends/${this.parentNode.type}`;
@@ -1641,9 +1687,22 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
             actionMsg,
         });
         super.delete();
-        this.traverseChildren((el) => {
+        this.traverseChildren(async (el) => {
             if (el?.concept === 'CallQueryComponent')
                 el.removeStructure();
+            // 仅仅针对 自定义连接器下的 Loigc，其他需要界定边界
+            const connector = el?.getAncestor?.('Connector');
+            if (['CallAuthInterface', 'CallInterface'].includes(el?.concept) && connector) {
+                const { calleeName } = el;
+                const targetInterface = connector.interfaces.find(i => i.name === calleeName);
+                if (targetInterface) {
+                    const refs = await this.app?.naslServer?._isHaveRef(targetInterface);
+                    // 如果只有两个引用，则必然为自身以及当前logic引用，需要删除此接口
+                    if (refs?.length <= 2) {
+                        targetInterface.deleteInterface();
+                    }
+                }
+            }
         });
         this.app?.emit('collect:end');
     }
@@ -1732,10 +1791,10 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
 };
 __decorate([
     (0, decorators_1.property)()
-], Logic.prototype, "concept", void 0);
+], Logic.prototype, "name", void 0);
 __decorate([
     (0, decorators_1.property)()
-], Logic.prototype, "name", void 0);
+], Logic.prototype, "title", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], Logic.prototype, "description", void 0);
@@ -1751,9 +1810,6 @@ __decorate([
 __decorate([
     (0, decorators_1.property)('Transactional')
 ], Logic.prototype, "transactional", void 0);
-__decorate([
-    (0, decorators_1.property)()
-], Logic.prototype, "compilerInfoMap", void 0);
 __decorate([
     (0, decorators_1.property)('TypeParam')
 ], Logic.prototype, "typeParams", void 0);
@@ -1782,13 +1838,14 @@ __decorate([
     (0, translator_1.withSourceMap)()
 ], Logic.prototype, "toNaturalTS", null);
 Logic = Logic_1 = __decorate([
+    decorators_1.className,
     (0, decorators_1.concept)('逻辑')
+    // @ts-ignore
 ], Logic);
 exports.Logic = Logic;
-classMap_1.default.Logic = Logic;
 exports.default = Logic;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================
 //# sourceMappingURL=Logic__.js.map