@lcap/nasl 4.4.0-beta.3 → 4.4.0-beta.31

package/out/natural/transforms/checker/index.d.ts

@@ -0,0 +1,19 @@
+import { type ParseNaturalTSState } from '../../utils';
+export { checkViewElement, validateComponentFeature, validateParentConstraints, } from './checkViewElement';
+export { checkDefaultValue } from './checkDefaultValue';
+export { checkLcapEntity } from './checkLcapEntity';
+export { checkDataQueryCalleeNameOrder } from './checkDataQueryCalleeNameOrder';
+export { checkValidationCalleeName } from './checkValidationCalleeName';
+export interface LintRule {
+    name: string;
+    description?: string;
+}
+/**
+ * 在 strictForTraining 模式下执行 lint 检查逻辑
+ * 当 options.strictForTraining 为 true 时，执行传入的检查函数
+ * @param rule LintRule 对象，包含 name 和可选的 description
+ * @param options 解析状态选项
+ * @param lintFn 需要执行的 lint 检查函数
+ */
+export declare function addLint<T extends ParseNaturalTSState>(options: T, rule: LintRule, lintFn: (rule: LintRule) => void): void;
+//# sourceMappingURL=index.d.ts.map

package/out/natural/transforms/checker/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/natural/transforms/checker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvD,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,mBAAmB,EACnD,OAAO,EAAE,CAAC,EACV,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAC/B,IAAI,CAIN"}

package/out/natural/transforms/checker/index.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addLint = exports.checkValidationCalleeName = exports.checkDataQueryCalleeNameOrder = exports.checkLcapEntity = exports.checkDefaultValue = exports.validateParentConstraints = exports.validateComponentFeature = exports.checkViewElement = void 0;
+// 统一导出所有校验相关的函数
+var checkViewElement_1 = require("./checkViewElement");
+Object.defineProperty(exports, "checkViewElement", { enumerable: true, get: function () { return checkViewElement_1.checkViewElement; } });
+Object.defineProperty(exports, "validateComponentFeature", { enumerable: true, get: function () { return checkViewElement_1.validateComponentFeature; } });
+Object.defineProperty(exports, "validateParentConstraints", { enumerable: true, get: function () { return checkViewElement_1.validateParentConstraints; } });
+var checkDefaultValue_1 = require("./checkDefaultValue");
+Object.defineProperty(exports, "checkDefaultValue", { enumerable: true, get: function () { return checkDefaultValue_1.checkDefaultValue; } });
+var checkLcapEntity_1 = require("./checkLcapEntity");
+Object.defineProperty(exports, "checkLcapEntity", { enumerable: true, get: function () { return checkLcapEntity_1.checkLcapEntity; } });
+var checkDataQueryCalleeNameOrder_1 = require("./checkDataQueryCalleeNameOrder");
+Object.defineProperty(exports, "checkDataQueryCalleeNameOrder", { enumerable: true, get: function () { return checkDataQueryCalleeNameOrder_1.checkDataQueryCalleeNameOrder; } });
+var checkValidationCalleeName_1 = require("./checkValidationCalleeName");
+Object.defineProperty(exports, "checkValidationCalleeName", { enumerable: true, get: function () { return checkValidationCalleeName_1.checkValidationCalleeName; } });
+/**
+ * 在 strictForTraining 模式下执行 lint 检查逻辑
+ * 当 options.strictForTraining 为 true 时，执行传入的检查函数
+ * @param rule LintRule 对象，包含 name 和可选的 description
+ * @param options 解析状态选项
+ * @param lintFn 需要执行的 lint 检查函数
+ */
+function addLint(options, rule, lintFn) {
+    if (options.strictForTraining) {
+        lintFn(rule);
+    }
+}
+exports.addLint = addLint;
+//# sourceMappingURL=index.js.map

package/out/natural/transforms/checker/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/natural/transforms/checker/index.ts"],"names":[],"mappings":";;;AAEA,gBAAgB;AAChB,uDAI4B;AAH1B,oHAAA,gBAAgB,OAAA;AAChB,4HAAA,wBAAwB,OAAA;AACxB,6HAAA,yBAAyB,OAAA;AAE3B,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,iFAAgF;AAAvE,8IAAA,6BAA6B,OAAA;AACtC,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAMlC;;;;;;GAMG;AACH,SAAgB,OAAO,CACrB,OAAU,EACV,IAAc,EACd,MAAgC;IAEhC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;AACH,CAAC;AARD,0BAQC"}

package/out/natural/transforms/transform2Entity.d.ts

@@ -1,3 +1,15 @@
-import { babelTypes, naslTypes, ParseNaturalTSState } from './utils';
+import { babelTypes, naslTypes, type ParseNaturalTSState } from '../utils';
+/**
+ * 将节点转换为 DatabaseTypeAnnotation 实例
+ * @param node 数据库类型注解的节点（可能是标识符或调用表达式）
+ * @param parseState 解析状态
+ * @returns DatabaseTypeAnnotation 实例
+ */
+export declare function transform2DatabaseTypeAnnotation(node: babelTypes.Identifier | babelTypes.CallExpression, parseState: ParseNaturalTSState): naslTypes.DatabaseTypeAnnotation | null;
+/**
+ * 将 rules 的 ArrayExpression（调用表达式风格）转为字符串数组
+ * 例：[min(0), max(100)] → ["min(0)", "max(100)"]
+ */
+export declare function transform2ValidationRules(arrayExpression: babelTypes.ArrayExpression, parseState: ParseNaturalTSState): string[];
 export declare function transform2Entity(node: babelTypes.ClassDeclaration, parseState: ParseNaturalTSState): naslTypes.Entity;
 //# sourceMappingURL=transform2Entity.d.ts.map

package/out/natural/transforms/transform2Entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform2Entity.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAuG,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAI1K,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAcrH"}
+{"version":3,"file":"transform2Entity.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAmD,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqC5H;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,cAAc,EACvD,UAAU,EAAE,mBAAmB,GAC9B,SAAS,CAAC,sBAAsB,GAAG,IAAI,CAkCzC;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,eAAe,EAAE,UAAU,CAAC,eAAe,EAC3C,UAAU,EAAE,mBAAmB,GAC9B,MAAM,EAAE,CAQV;AAqFD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,UAAU,CAAC,gBAAgB,EACjC,UAAU,EAAE,mBAAmB,GAC9B,SAAS,CAAC,MAAM,CAkBlB"}

package/out/natural/transforms/transform2Entity.js

@@ -1,25 +1,173 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transform2Entity = void 0;
-const utils_1 = require("./utils");
+exports.transform2Entity = exports.transform2ValidationRules = exports.transform2DatabaseTypeAnnotation = void 0;
+const utils_1 = require("../utils");
+const checker_1 = require("./checker");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
-const utils_2 = require("../../utils");
+const parseDecorator_1 = require("./utils/parseDecorator");
+/**
+ * 数据库类型参数名称映射表（MySQL）
+ * 将不同数据库类型的参数索引映射为语义化的参数名
+ * 根据 /api/v1/database/types 接口返回的 MySQL 数据库类型定义
+ */
+const DATABASE_TYPE_PARAM_NAMES = {
+    // 小数
+    decimal: ['precision', 'scale'],
+    numeric: ['precision'],
+    dec: ['precision'],
+    real: ['precision'],
+    // 整数
+    int: ['displayWidth'],
+    tinyint: ['displayWidth'],
+    smallint: ['displayWidth'],
+    bigint: ['displayWidth'],
+    mediumint: ['displayWidth'],
+    integer: ['displayWidth'],
+    // 字符串
+    varchar: ['length'],
+    char: ['length'],
+};
+// 无参数的属性
+// - TEXT、TINYTEXT、MEDIUMTEXT、LONGTEXT
+// - DOUBLE、FLOAT
+// - DATE、TIME、DATETIME、TIMESTAMP
+/**
+ * 将节点转换为 DatabaseTypeAnnotation 实例
+ * @param node 数据库类型注解的节点（可能是标识符或调用表达式）
+ * @param parseState 解析状态
+ * @returns DatabaseTypeAnnotation 实例
+ */
+function transform2DatabaseTypeAnnotation(node, parseState) {
+    if (node.type === 'Identifier') {
+        // 标识符形式（如 SMALLINT）
+        return new utils_1.naslTypes.DatabaseTypeAnnotation({
+            typeName: node.name.toLowerCase(),
+        });
+    }
+    else if (node.type === 'CallExpression') {
+        // 调用表达式形式（如 DECIMAL(2) 或 VARCHAR(255)）
+        const callee = node.callee;
+        if (callee.type === 'Identifier') {
+            const typeName = callee.name.toLowerCase();
+            const args = {};
+            const paramNames = DATABASE_TYPE_PARAM_NAMES[typeName];
+            node.arguments.forEach((arg, index) => {
+                if (arg.type === 'NumericLiteral' || arg.type === 'StringLiteral') {
+                    // 使用语义化的参数名，如果没有定义则使用索引
+                    const paramName = paramNames && paramNames[index] ? paramNames[index] : index.toString();
+                    args[paramName] = String(arg.value);
+                }
+            });
+            return new utils_1.naslTypes.DatabaseTypeAnnotation({
+                typeName,
+                arguments: Object.keys(args).length > 0 ? args : undefined,
+            });
+        }
+        else {
+            return (0, utils_1.throwError)(parseState, '不支持的 databaseTypeAnnotation 调用形式：' + (0, utils_1.generate)(node).code);
+        }
+    }
+    else {
+        return (0, utils_1.throwError)(parseState, '不支持的 databaseTypeAnnotation 类型：' + (0, utils_1.generate)(node).code);
+    }
+}
+exports.transform2DatabaseTypeAnnotation = transform2DatabaseTypeAnnotation;
+/**
+ * 将 rules 的 ArrayExpression（调用表达式风格）转为字符串数组
+ * 例：[min(0), max(100)] → ["min(0)", "max(100)"]
+ */
+function transform2ValidationRules(arrayExpression, parseState) {
+    return arrayExpression.elements.map((el) => {
+        if (el.type === 'CallExpression' && el.callee.type === 'Identifier') {
+            const args = el.arguments.map((a) => (0, utils_1.generate)(a).code).join(', ');
+            return `${el.callee.name}(${args})`;
+        }
+        return (0, utils_1.throwError)(parseState, '不支持的 rules 元素类型，应为调用表达式（如 min(0)）：' + (0, utils_1.generate)(el).code);
+    });
+}
+exports.transform2ValidationRules = transform2ValidationRules;
+/**
+ * EntityProperty 的 dbType 相关后处理：
+ * - DECIMAL：提取 scale 到 typeAnnotation.ruleMap，清理 arguments.scale
+ * - Decimal 默认兜底（无 databaseTypeAnnotation）：scale = 2
+ * - VARCHAR/CHAR：自动将 length 推导为 maxLength 规则
+ */
+function postProcessEntityPropertyDbType(property) {
+    // DECIMAL scale 拆分：从 arguments 提取 scale 到 typeAnnotation.ruleMap
+    if (property.databaseTypeAnnotation?.typeName === 'decimal' &&
+        property.databaseTypeAnnotation?.arguments?.scale !== undefined) {
+        const scale = parseInt(property.databaseTypeAnnotation.arguments.scale, 10);
+        if (!isNaN(scale)) {
+            property.typeAnnotation.ruleMap = { scale };
+        }
+        delete property.databaseTypeAnnotation.arguments.scale;
+        if (Object.keys(property.databaseTypeAnnotation.arguments).length === 0) {
+            property.databaseTypeAnnotation.arguments = undefined;
+        }
+    }
+    // Decimal 默认兜底：无 databaseTypeAnnotation 时，补全 scale=2
+    if (property.typeAnnotation?.typeName === 'Decimal' && !property.databaseTypeAnnotation) {
+        property.typeAnnotation.ruleMap = { scale: property.typeAnnotation.ruleMap?.scale ?? 2 };
+    }
+    // VARCHAR/CHAR → 自动推导 maxLength 规则
+    const dbType = property.databaseTypeAnnotation;
+    if (dbType &&
+        (dbType.typeName === 'varchar' || dbType.typeName === 'char') &&
+        dbType.arguments?.length !== undefined) {
+        const length = parseInt(String(dbType.arguments.length), 10);
+        if (!isNaN(length)) {
+            property.rules = property.rules ?? [];
+            if (!property.rules.some((r) => r.startsWith('maxLength('))) {
+                property.rules.push(`maxLength(${length})`);
+            }
+        }
+    }
+}
+/** 各 NASL 类型允许的 rule 前缀（类型名为 NASL 内部名称） */
+const ALLOWED_RULE_PREFIXES_BY_TYPE = {
+    Long: ['min(', 'max('], // Natural TS: Integer
+    Decimal: ['min(', 'max('],
+    String: ['minLength(', 'maxLength('],
+};
+/**
+ * 检查 EntityProperty.rules 中的规则名称是否与属性类型匹配
+ */
+function checkEntityPropertyRules(property, parseState) {
+    const rules = property.rules;
+    if (!rules || rules.length === 0)
+        return;
+    const typeName = property.typeAnnotation?.typeName;
+    const allowed = ALLOWED_RULE_PREFIXES_BY_TYPE[typeName];
+    if (!allowed) {
+        // 其他类型不允许有 rules
+        (0, utils_1.throwError)(parseState, `类型 ${typeName} 不支持 rules 配置`);
+        return;
+    }
+    for (const rule of rules) {
+        if (!allowed.some((prefix) => rule.startsWith(prefix))) {
+            (0, utils_1.throwError)(parseState, `规则 "${rule}" 不适用于类型 ${typeName}，${typeName} 只允许 ${allowed.map(p => p.replace('(', '')).join(' / ')}`);
+        }
+    }
+}
 function transform2Entity(node, parseState) {
     const entity = new utils_1.naslTypes.Entity();
     parseState.nodeName = entity.name = node.id.name;
-    entity.tableName = `${node.id.name}_${(0, utils_2.uuidv4)().replace(/-/g, '').substring(0, 6)}`;
+    entity.tableName = `${node.id.name}_${(0, utils_1.uuidv4)().replace(/-/g, '').substring(0, 6)}`;
     entity.description = (0, utils_1.fetchFromComments)(node.leadingComments);
+    (0, parseDecorator_1.processDecoratorsByConfig)(node.decorators, [parseDecorator_1.ENTITY_DECORATOR], entity, parseState);
     entity.properties = [];
     node.body.body.forEach((node) => {
         if (node.type === 'ClassProperty') {
             entity.properties.push(transform2EntityProperty(node, parseState));
         }
     });
+    (0, checker_1.checkLcapEntity)(entity, parseState);
     return entity;
 }
 exports.transform2Entity = transform2Entity;
 const SYSTEM_PROPERTIES = new Set(['id', 'createdTime', 'updatedTime', 'createdBy', 'updatedBy']);
 const HIDDEN_PROPERTIES = new Set(['id', 'createdBy', 'updatedBy']);
+const SCOPE_HIDDEN_PROPERTIES = new Set(['createdTime', 'updatedTime']);
 const PROPERTY_LABELS = new Map([
     ['id', '主键'],
     ['createdTime', '创建时间'],
@@ -37,7 +185,15 @@ function transform2EntityProperty(node, parseState) {
     const property = new utils_1.naslTypes.EntityProperty();
     property.columnName = property.name = node.key.name;
     property.label = (0, utils_1.fetchFromComments)(node.leadingComments || node?.key?.leadingComments);
-    property.typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(node.typeAnnotation.typeAnnotation, parseState) || undefined;
+    property.typeAnnotation =
+        (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(node.typeAnnotation.typeAnnotation, parseState) || undefined;
+    const propertyTypeAnnotation = property?.typeAnnotation;
+    // 目前模型生成只支持基础类型和枚举类型，不支持泛型和引用类型
+    if (propertyTypeAnnotation?.typeKind === 'generic' ||
+        (propertyTypeAnnotation?.typeKind === 'reference' &&
+            !propertyTypeAnnotation?.typeNamespace?.includes('app.enums'))) {
+        (0, utils_1.throwError)(parseState, `实体属性不允许设置 ${property.typeAnnotation.toNaturalTS()} 类型`, node);
+    }
     if (property.name === 'id')
         property.primaryKey = true;
     const { name } = property;
@@ -50,20 +206,19 @@ function transform2EntityProperty(node, parseState) {
     if (HIDDEN_PROPERTIES.has(name)) {
         property.display = { ...DEFAULT_HIDDEN_DISPLAY };
     }
-    const decoratorsExpression = node.decorators?.[0]?.expression;
-    if (decoratorsExpression?.type === 'CallExpression' && decoratorsExpression?.callee?.name === 'EntityRelation') {
-        const decoratorsNode = decoratorsExpression?.typeParameters;
-        if (decoratorsNode?.params && decoratorsNode.params[0].type === 'TSIndexedAccessType') {
-            const releationNode = decoratorsNode.params[0];
-            const relationProperty = (0, utils_1.generate)(releationNode?.indexType).code || '';
-            const relationEntity = (0, utils_1.generate)(releationNode?.objectType?.typeName?.right).code || '';
-            const relationNamespace = (0, utils_1.generate)(releationNode?.objectType?.typeName?.left).code || '';
-            property.relationNamespace = relationNamespace;
-            property.relationEntity = relationEntity;
-            property.relationProperty = relationProperty.replace(/[']/g, '');
-            property.deleteRule = 'protect';
+    if (SCOPE_HIDDEN_PROPERTIES.has(name)) {
+        property.display = { ...DEFAULT_HIDDEN_DISPLAY, inTable: true };
+    }
+    // 处理默认值
+    if (node.value) {
+        const defaultValue = (0, checker_1.checkDefaultValue)(node.value, parseState, property.typeAnnotation);
+        if (defaultValue) {
+            property.defaultValue = defaultValue;
         }
     }
+    (0, parseDecorator_1.processDecoratorsByConfig)(node.decorators, [parseDecorator_1.ENTITY_PROPERTY_DECORATOR, parseDecorator_1.ENTITY_RELATION_DECORATOR], property, parseState);
+    postProcessEntityPropertyDbType(property);
+    checkEntityPropertyRules(property, parseState);
     return property;
 }
 //# sourceMappingURL=transform2Entity.js.map

package/out/natural/transforms/transform2Entity.js.map

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

package/out/natural/transforms/transform2Enum.d.ts

@@ -1,3 +1,3 @@
-import { babelTypes, naslTypes, ParseNaturalTSState } from './utils';
+import { babelTypes, naslTypes, type ParseNaturalTSState } from '../utils';
 export declare function transform2Enum(node: babelTypes.ClassDeclaration, leadingComments: Array<babelTypes.Comment | babelTypes.CommentBlock>, parseState: ParseNaturalTSState): naslTypes.Enum;
 //# sourceMappingURL=transform2Enum.d.ts.map

package/out/natural/transforms/transform2Enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform2Enum.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAuG,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAI1K,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAuCvL"}
+{"version":3,"file":"transform2Enum.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAiC,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAO1G,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,IAAI,CA0CvL"}

package/out/natural/transforms/transform2Enum.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform2Enum = void 0;
-const utils_1 = require("./utils");
+const utils_1 = require("../utils");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
+const parseDecorator_1 = require("./utils/parseDecorator");
 function transform2Enum(node, leadingComments, parseState) {
     const enumeration = new utils_1.naslTypes.Enum();
     parseState.nodeName = enumeration.name = node.id.name;
     enumeration.description = (0, utils_1.fetchFromComments)(leadingComments);
     enumeration.valueType = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(node.superTypeParameters.params[0], parseState) || undefined;
+    (0, parseDecorator_1.processDecoratorsByConfig)(node.decorators, [parseDecorator_1.ENUM_DECORATOR], enumeration, parseState);
+    if (!enumeration.label)
+        enumeration.label = enumeration.description;
     node.body.body.forEach((item) => {
         const enumItem = new utils_1.naslTypes.EnumItem();
         if (item.type === 'ClassProperty') {

package/out/natural/transforms/transform2Enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform2Enum.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":";;;AAAA,mCAA0K;AAC1K,yEAAsE;AAGtE,SAAgB,cAAc,CAAC,IAAiC,EAAE,eAAoE,EAAE,UAA+B;IACnK,MAAM,WAAW,GAAG,IAAI,iBAAS,CAAC,IAAI,EAAE,CAAC;IACzC,UAAU,CAAC,QAAQ,GAAG,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IACtD,WAAW,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,eAAe,CAAC,CAAC;IAC7D,WAAW,CAAC,SAAS,GAAG,IAAA,mDAAwB,EAAE,IAAI,CAAC,mBAA+D,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC;IAE3J,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,QAAQ,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAClC,IAAI,GAAG,GAAW,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACnC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YACtB,CAAC;iBAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC7C,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;YACvB,CAAC;iBAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAC9C,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YAED,IAAG,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACvC,MAAM,IAAI,GAAQ,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;gBACvC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACpC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC5B,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,KAAG,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;oBAC3F,IAAA,kBAAU,EAAC,UAAU,EAAE,YAAY,KAAK,SAAS,WAAW,CAAC,IAAI,eAAe,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;gBAClH,CAAC;gBACD,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;oBAClB,IAAA,kBAAU,EAAC,UAAU,EAAE,aAAa,GAAG,kBAAkB,KAAK,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC/E,CAAC;gBAED,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;gBACvB,QAAQ,CAAC,KAAK,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC;oBAC1C,KAAK,EAAE,KAAK;iBACb,CAAC,CAAA;gBACF,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACvB,CAAC;AAvCD,wCAuCC"}
+{"version":3,"file":"transform2Enum.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2GlobalLogicDeclaration.d.ts

@@ -1,3 +1,3 @@
-import { babelTypes, naslTypes, ParseNaturalTSState } from './utils';
-export declare function transform2GlobalLogicDeclaration(node: babelTypes.TSDeclareFunction, parseState: ParseNaturalTSState): naslTypes.Logic;
+import { babelTypes, naslTypes, type ParseNaturalTSState } from '../utils';
+export declare function transform2GlobalLogicDeclaration(node: babelTypes.TSDeclareFunction, decorator: babelTypes.CallExpression | undefined, parseState: ParseNaturalTSState): naslTypes.Logic;
 //# sourceMappingURL=transform2GlobalLogicDeclaration.d.ts.map

package/out/natural/transforms/transform2GlobalLogicDeclaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform2GlobalLogicDeclaration.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAuG,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAK1K,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,KAAK,CAkBrI"}
+{"version":3,"file":"transform2GlobalLogicDeclaration.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAqB,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAK9F,wBAAgB,gCAAgC,CAC5C,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAClC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,UAAU,EAAE,mBAAmB,GAChC,SAAS,CAAC,KAAK,CAsCjB"}

package/out/natural/transforms/transform2GlobalLogicDeclaration.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform2GlobalLogicDeclaration = void 0;
-const utils_1 = require("./utils");
+const utils_1 = require("../utils");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
-const transform2LogicItem_1 = require("./transform2LogicItem");
-function transform2GlobalLogicDeclaration(node, parseState) {
+const transform2Param_1 = require("./transform2Param");
+const parseDecorator_1 = require("./utils/parseDecorator");
+function transform2GlobalLogicDeclaration(node, decorator, parseState) {
     const logic = new utils_1.naslTypes.Logic();
     parseState.nodeName = logic.name = node.id.name;
     logic.description = (0, utils_1.fetchFromComments)(node.leadingComments);
@@ -12,13 +13,26 @@ function transform2GlobalLogicDeclaration(node, parseState) {
         new utils_1.naslTypes.Start(),
         new utils_1.naslTypes.End(),
     ];
-    logic.params = node.params.map((param) => (0, transform2LogicItem_1.transform2Param)(param, { ...parseState, transformType: 'attr' })).filter(Boolean);
+    logic.params = node.params.map((param) => (0, transform2Param_1.transform2Param)(param, { ...parseState, transformType: 'attr' })).filter(Boolean);
     if (node.returnType && node.returnType.typeAnnotation.type !== 'TSVoidKeyword') {
         logic.returns.push(new utils_1.naslTypes.Return({
             name: 'result',
             typeAnnotation: (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(node.returnType.typeAnnotation, parseState) || undefined,
         }));
     }
+    // 处理 $Logic 装饰器
+    if (decorator && decorator.arguments[0]?.type === 'ObjectExpression') {
+        const logicMetadata = (0, parseDecorator_1.pickDecoratorObject)(decorator.arguments[0], parseDecorator_1.LOGIC_DECORATOR.allowedKeys, parseDecorator_1.LOGIC_DECORATOR.mappings || {}, parseState);
+        if (logicMetadata.description) {
+            logic.description = logicMetadata.description;
+        }
+        if (logicMetadata.transactional !== undefined) {
+            logic.transactional = new utils_1.naslTypes.Transactional({ enabled: logicMetadata.transactional });
+        }
+        if (logicMetadata.directory !== undefined) {
+            logic._directoryInfo = logicMetadata.directory;
+        }
+    }
     return logic;
 }
 exports.transform2GlobalLogicDeclaration = transform2GlobalLogicDeclaration;

package/out/natural/transforms/transform2GlobalLogicDeclaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform2GlobalLogicDeclaration.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":";;;AAAA,mCAA0K;AAC1K,yEAAsE;AAEtE,+DAAwD;AAExD,SAAgB,gCAAgC,CAAC,IAAkC,EAAE,UAA+B;IAChH,MAAM,KAAK,GAAG,IAAI,iBAAS,CAAC,KAAK,EAAE,CAAC;IACpC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAChD,KAAK,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5D,KAAK,CAAC,IAAI,GAAG;QACT,IAAI,iBAAS,CAAC,KAAK,EAAE;QACrB,IAAI,iBAAS,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,qCAAe,EAAC,KAA6D,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAsB,CAAC;IACzM,IAAI,IAAI,CAAC,UAAU,IAAK,IAAI,CAAC,UAA0C,CAAC,cAAc,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC9G,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,cAAc,EAAE,IAAA,mDAAwB,EAAE,IAAI,CAAC,UAA0C,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS;SACrI,CAAC,CAAC,CAAC;IACR,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAlBD,4EAkBC"}
+{"version":3,"file":"transform2GlobalLogicDeclaration.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":";;;AAAA,oCAA8F;AAC9F,yEAAsE;AACtE,uDAAoD;AACpD,2DAA8E;AAE9E,SAAgB,gCAAgC,CAC5C,IAAkC,EAClC,SAAgD,EAChD,UAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,iBAAS,CAAC,KAAK,EAAE,CAAC;IACpC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAChD,KAAK,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5D,KAAK,CAAC,IAAI,GAAG;QACT,IAAI,iBAAS,CAAC,KAAK,EAAE;QACrB,IAAI,iBAAS,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iCAAe,EAAC,KAA6D,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAsB,CAAC;IACzM,IAAI,IAAI,CAAC,UAAU,IAAK,IAAI,CAAC,UAA0C,CAAC,cAAc,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC9G,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,cAAc,EAAE,IAAA,mDAAwB,EAAE,IAAI,CAAC,UAA0C,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS;SACrI,CAAC,CAAC,CAAC;IACR,CAAC;IAED,gBAAgB;IAChB,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,IAAA,oCAAmB,EACrC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,gCAAe,CAAC,WAAW,EAC3B,gCAAe,CAAC,QAAQ,IAAI,EAAE,EAC9B,UAAU,CACb,CAAC;QAEF,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;YAC5B,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAClD,CAAC;QACD,IAAI,aAAa,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,CAAC,aAAa,GAAG,IAAI,iBAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACvC,KAAa,CAAC,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC;QAC5D,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AA1CD,4EA0CC"}

package/out/natural/transforms/transform2Logic.d.ts

@@ -1,5 +1,5 @@
-import { babelTypes, naslTypes, ParseLogicState } from './utils';
-export declare function transformFunctionDeclaration2Logic(func: babelTypes.FunctionDeclaration, contextLogicName: string, currentPositionComment: babelTypes.CommentLine, options: ParseLogicState): naslTypes.Logic;
-export declare function transformFunctionExpression2Logic(func: babelTypes.ArrowFunctionExpression | babelTypes.FunctionExpression, contextLogicName: string, options: ParseLogicState): naslTypes.Logic;
-export declare function transform2Logic(func: babelTypes.ArrowFunctionExpression | babelTypes.FunctionExpression | babelTypes.FunctionDeclaration, contextLogicName: string, options: ParseLogicState): naslTypes.Logic;
+import { babelTypes, naslTypes, type ParseLogicState } from '../utils';
+export declare function transformFunctionDeclaration2Logic(func: babelTypes.FunctionDeclaration, contextLogicName: string, currentPositionComment: babelTypes.CommentLine, decorator: babelTypes.CallExpression | undefined, options: ParseLogicState): naslTypes.Logic;
+export declare function transformFunctionExpression2Logic(func: babelTypes.ArrowFunctionExpression | babelTypes.FunctionExpression, contextLogicName: string, decorator: babelTypes.CallExpression | undefined, options: ParseLogicState): naslTypes.Logic;
+export declare function transform2Logic(func: babelTypes.ArrowFunctionExpression | babelTypes.FunctionExpression | babelTypes.FunctionDeclaration, contextLogicName: string, decorator: babelTypes.CallExpression | undefined, options: ParseLogicState): naslTypes.Logic;
 //# sourceMappingURL=transform2Logic.d.ts.map

package/out/natural/transforms/transform2Logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform2Logic.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA2C,eAAe,EAAqB,MAAM,SAAS,CAAC;AAW7H,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,EAAE,sBAAsB,EAAE,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,eAAe,GAAG,SAAS,CAAC,KAAK,CA6E5M;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,SAAS,CAAC,KAAK,CAiB/L;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,GAAG,UAAU,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,SAAS,CAAC,KAAK,CAM9M"}
+{"version":3,"file":"transform2Logic.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA+C,KAAK,eAAe,EAAuB,MAAM,UAAU,CAAC;AAYzI,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,gBAAgB,EAAE,MAAM,EACxB,sBAAsB,EAAE,UAAU,CAAC,WAAW,EAC9C,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAmIjB;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,EACxE,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAiBjB;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,GAAG,UAAU,CAAC,mBAAmB,EACzG,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAMjB"}

package/out/natural/transforms/transform2Logic.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform2Logic = exports.transformFunctionExpression2Logic = exports.transformFunctionDeclaration2Logic = void 0;
-const utils_1 = require("./utils");
-const utils_2 = require("../../utils");
+const utils_1 = require("../utils");
 const transform2LogicItem_1 = require("./transform2LogicItem");
+const transform2Param_1 = require("./transform2Param");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
-function getLogicTypeFromName(logicName) {
-    if (logicName.includes('on_') || logicName.includes('businessLogic_'))
-        return 'event_logic';
-    if (logicName.includes('viewLogic_'))
+const parseDecorator_1 = require("./utils/parseDecorator");
+function getLogicType(options) {
+    if (options?.nodeNamespace?.includes('app.logics'))
+        return 'global_logic';
+    if (options?.nodeNamespace?.includes('.views'))
         return 'view_logic';
-    return 'global_logic';
+    if (options?.parentTag)
+        return 'event_logic';
 }
-function transformFunctionDeclaration2Logic(func, contextLogicName, currentPositionComment, options) {
+function transformFunctionDeclaration2Logic(func, contextLogicName, currentPositionComment, decorator, options) {
     const logic = new utils_1.naslTypes.Logic();
     options.nodeName = logic.name = contextLogicName || func.id?.name;
     logic.body = [
@@ -46,15 +48,32 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
     }
     parameters.forEach((node) => {
         let param;
-        param = (0, transform2LogicItem_1.transform2Param)(node, { ...options, transformType: 'attr' }) || undefined;
+        param = (0, transform2Param_1.transform2Param)(node, { ...options, transformType: 'attr' }) || undefined;
         param && logic.params.push(param);
     });
-    statements.forEach((node) => {
+    let returnDecorator;
+    statements.forEach((node, index) => {
+        // 跳过 $Variable 装饰器调用语句
+        if ((0, utils_1.getDecoratorCall)(node, 'Variable')) {
+            return;
+        }
+        // 跳过 $Return 装饰器调用语句，同时记录（位置无关，函数级别注解）
+        const returnDecoratorCall = (0, utils_1.getDecoratorCall)(node, 'Return');
+        if (returnDecoratorCall) {
+            returnDecorator = returnDecoratorCall;
+            return;
+        }
+        // 检查当前节点是否是 VariableDeclaration，如果是，检查前一个语句是否是 $Variable 装饰器调用
+        let variableDecorator;
+        if (node.type === 'VariableDeclaration') {
+            variableDecorator = (0, utils_1.getDecoratorCall)(statements[index - 1], 'Variable');
+        }
         const item = (0, transform2LogicItem_1.transform2LogicItem)(node, {
             ...options,
             transformType: 'logic',
             logic,
-            logicType: getLogicTypeFromName(logic.name),
+            logicType: options?.logicType || getLogicType(options),
+            decorator: variableDecorator,
         });
         item && logic.body.push(item);
     });
@@ -71,6 +90,12 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
             if (typeAnnotation)
                 logic.returns[0].typeAnnotation = typeAnnotation;
         }
+        if (returnDecorator && returnDecorator.arguments[0]?.type === 'ObjectExpression') {
+            const returnMetadata = (0, parseDecorator_1.pickDecoratorObject)(returnDecorator.arguments[0], parseDecorator_1.RETURN_DECORATOR.allowedKeys, parseDecorator_1.RETURN_DECORATOR.mappings || {}, options);
+            if (returnMetadata.autoInferType === true) {
+                delete logic.returns[0].typeAnnotation;
+            }
+        }
     }
     if (!logic?.returns?.length && func?.returnType) {
         const typeAnnotation = func.returnType?.typeAnnotation;
@@ -81,11 +106,27 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
             }));
         }
     }
+    // 处理 $Logic 装饰器
+    if (decorator && decorator.arguments[0]?.type === 'ObjectExpression') {
+        // 根据 logicType 选择合适的装饰器配置
+        const isViewLogic = options.logicType === 'view_logic' || options.logicType === 'event_logic';
+        const decoratorConfig = isViewLogic ? parseDecorator_1.VIEW_LOGIC_DECORATOR : parseDecorator_1.LOGIC_DECORATOR;
+        const logicMetadata = (0, parseDecorator_1.pickDecoratorObject)(decorator.arguments[0], decoratorConfig.allowedKeys, decoratorConfig.mappings || {}, options);
+        if (logicMetadata.description) {
+            logic.description = logicMetadata.description;
+        }
+        if (logicMetadata.transactional !== undefined) {
+            logic.transactional = new utils_1.naslTypes.Transactional({ enabled: logicMetadata.transactional });
+        }
+        if (logicMetadata.directory !== undefined) {
+            logic._directoryInfo = logicMetadata.directory;
+        }
+    }
     return logic;
 }
 exports.transformFunctionDeclaration2Logic = transformFunctionDeclaration2Logic;
-function transformFunctionExpression2Logic(func, contextLogicName, options) {
-    let name = contextLogicName || `logic_${(0, utils_2.uuidv4)().slice(0, 2)}`;
+function transformFunctionExpression2Logic(func, contextLogicName, decorator, options) {
+    let name = contextLogicName || `logic_${(0, utils_1.uuidv4)().slice(0, 2)}`;
     if (func.type === 'FunctionExpression') {
         name = func.id?.name || name;
     }
@@ -99,15 +140,15 @@ function transformFunctionExpression2Logic(func, contextLogicName, options) {
         },
         params: func.params,
         body: func.body,
-    }, contextLogicName, undefined, options);
+    }, contextLogicName, undefined, decorator, options);
 }
 exports.transformFunctionExpression2Logic = transformFunctionExpression2Logic;
-function transform2Logic(func, contextLogicName, options) {
+function transform2Logic(func, contextLogicName, decorator, options) {
     if (func.type === 'ArrowFunctionExpression' || func.type === 'FunctionExpression') {
-        return transformFunctionExpression2Logic(func, contextLogicName, options);
+        return transformFunctionExpression2Logic(func, contextLogicName, decorator, options);
     }
     else {
-        return transformFunctionDeclaration2Logic(func, contextLogicName, undefined, options);
+        return transformFunctionDeclaration2Logic(func, contextLogicName, undefined, decorator, options);
     }
 }
 exports.transform2Logic = transform2Logic;