@lcap/nasl 4.5.0-beta.1 → 4.5.0-beta.3

package/out/natural/transforms/utils/parseDecorator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processDecoratorsByConfig = exports.RETURN_DECORATOR = exports.STRUCTURE_PROPERTY_DECORATOR = exports.VIEW_VARIABLE_DECORATOR = exports.FRONTEND_VARIABLE_DECORATOR = exports.BACKEND_VARIABLE_DECORATOR = exports.VARIABLE_DECORATOR = exports.VIEW_LOGIC_DECORATOR = exports.LOGIC_DECORATOR = exports.STRUCTURE_DECORATOR = exports.ENUM_DECORATOR = exports.ENTITY_RELATION_DECORATOR = exports.ENTITY_PROPERTY_DECORATOR = exports.ENTITY_DECORATOR = exports.pickDecoratorObject = void 0;
 const utils_1 = require("../../utils");
 const transform2Entity_1 = require("../transform2Entity");
+const checker_1 = require("../checker");
 const transform2Directory_1 = require("./transform2Directory");
 /**
  * 从装饰器对象表达式中提取指定的属性
@@ -13,7 +14,11 @@ function pickDecoratorObject(objectExpression, keys, mappings, parseState) {
     objectExpression.properties.forEach((item) => {
         if (item.type === 'ObjectProperty' && item.key.type === 'Identifier' && keys.has(item.key.name)) {
             let value;
-            if (item.value.type === 'NullLiteral') {
+            // dbType 需要特殊转换，优先按 key 拦截，避免被下方 StringLiteral 等 type 分支吃掉
+            if (item.key.name === 'dbType') {
+                value = (0, transform2Entity_1.transform2DatabaseTypeAnnotation)(item.value, parseState);
+            }
+            else if (item.value.type === 'NullLiteral') {
                 value = null;
             }
             else if (item.value.type === 'BooleanLiteral') {
@@ -32,21 +37,28 @@ function pickDecoratorObject(objectExpression, keys, mappings, parseState) {
             else if (item.value.type === 'NumericLiteral') {
                 value = item.value.value;
             }
-            else if (item.key.name === 'dbType') {
-                if (item.value.type === 'Identifier' || item.value.type === 'CallExpression') {
-                    value = (0, transform2Entity_1.transform2DatabaseTypeAnnotation)(item.value, parseState);
+            else if (item.value.type === 'ArrayExpression') {
+                if (item.key.name === 'rules') {
+                    value = (0, transform2Entity_1.transform2ValidationRules)(item.value, parseState);
+                }
+                else if (item.value.elements.every(el => el?.type === 'StringLiteral')) {
+                    value = item.value.elements.map(el => el.value);
                 }
                 else {
-                    return (0, utils_1.throwError)(parseState, '不支持的 dbType 类型：' + (0, utils_1.generate)(item).code);
+                    return (0, utils_1.throwError)(parseState, '不支持的数组元素类型，目前只支持字符串数组：' + (0, utils_1.generate)(item).code);
                 }
             }
-            else if (item.key.name === 'rules') {
-                if (item.value.type === 'ArrayExpression') {
-                    value = (0, transform2Entity_1.transform2ValidationRules)(item.value, parseState);
-                }
-                else {
-                    return (0, utils_1.throwError)(parseState, '不支持的 rules 类型，应为调用表达式数组（如 [min(0), max(100)]）：' + (0, utils_1.generate)(item).code);
+            else if (item.value.type === 'MemberExpression') {
+                value = (0, utils_1.generate)(item.value).code;
+            }
+            else if (item.value.type === 'ObjectExpression') {
+                const obj = {};
+                for (const p of item.value.properties) {
+                    if (p.type === 'ObjectProperty' && p.key.type === 'Identifier' && p.value.type === 'StringLiteral') {
+                        obj[p.key.name] = p.value.value;
+                    }
                 }
+                value = obj;
             }
             else {
                 return (0, utils_1.throwError)(parseState, '不支持的装饰器对象属性值：' + (0, utils_1.generate)(item).code);
@@ -66,10 +78,7 @@ exports.pickDecoratorObject = pickDecoratorObject;
  */
 exports.ENTITY_DECORATOR = {
     name: 'Entity',
-    allowedKeys: new Set(['title', 'uuid', 'tableName', 'origin', 'directory']),
-    mappings: {
-        title: 'description',
-    },
+    allowedKeys: new Set(['title', 'description', 'uuid', 'tableName', 'origin', 'directory']),
 };
 /**
  * EntityProperty 装饰器处理器配置
@@ -107,6 +116,7 @@ exports.ENTITY_RELATION_DECORATOR = {
                 const relationProperty = (0, utils_1.generate)(releationNode.indexType).code || '';
                 const objectTypeName = releationNode.objectType.typeName;
                 const relationEntity = (0, utils_1.generate)(objectTypeName.right).code || '';
+                (0, checker_1.checkEntityName)(relationEntity, parseState, decorator);
                 const relationNamespace = (0, utils_1.generate)(objectTypeName.left).code || '';
                 property.relationNamespace = relationNamespace;
                 property.relationEntity = relationEntity;
@@ -132,7 +142,7 @@ exports.ENUM_DECORATOR = {
     name: 'Enum',
     allowedKeys: new Set(['title', 'description', 'directory']),
     mappings: {
-        title: 'description',
+        title: 'label',
     },
 };
 /**
@@ -140,24 +150,21 @@ exports.ENUM_DECORATOR = {
  */
 exports.STRUCTURE_DECORATOR = {
     name: 'Structure',
-    allowedKeys: new Set(['title', 'directory']),
-    mappings: {
-        title: 'description',
-    },
+    allowedKeys: new Set(['title', 'description', 'directory']),
 };
 /**
  * Logic 装饰器处理器配置（服务端全局逻辑）
  */
 exports.LOGIC_DECORATOR = {
     name: 'Logic',
-    allowedKeys: new Set(['description', 'transactional', 'directory']),
+    allowedKeys: new Set(['title', 'description', 'transactional', 'directory', 'returnDescription']),
 };
 /**
  * Logic 装饰器处理器配置（View 中的前端逻辑）
  */
 exports.VIEW_LOGIC_DECORATOR = {
     name: 'Logic',
-    allowedKeys: new Set(['description', 'directory']),
+    allowedKeys: new Set(['title', 'description', 'directory', 'returnDescription']),
 };
 /**
  * Variable 装饰器处理器配置（普通变量）
@@ -215,12 +222,14 @@ function processDecoratorsByConfig(decorators, handlers, target, parseState) {
     if (!decorators || decorators.length === 0)
         return;
     decorators.forEach((decorator) => {
+        const decoratorExpression = decorator.expression;
+        let matched = false;
         handlers.forEach((handler) => {
-            const decoratorExpression = decorator.expression;
             // 检查是否匹配当前处理器
             if (decoratorExpression.type === 'CallExpression' &&
                 decoratorExpression.callee.type === 'Identifier' &&
                 decoratorExpression.callee.name === handler.name) {
+                matched = true;
                 // 优先使用自定义处理器
                 if (handler.customHandler) {
                     handler.customHandler(decorator, target, parseState);
@@ -244,8 +253,15 @@ function processDecoratorsByConfig(decorators, handlers, target, parseState) {
                     }
                 }
             }
-            // ignore other decorators
         });
+        if (!matched) {
+            const decoratorName = decoratorExpression.type === 'CallExpression' &&
+                decoratorExpression.callee.type === 'Identifier'
+                ? decoratorExpression.callee.name
+                : (0, utils_1.generate)(decoratorExpression).code;
+            const allowedNames = handlers.map(h => `@${h.name}`).join('、');
+            (0, utils_1.throwError)(parseState, `不支持的装饰器 @${decoratorName}，此处仅允许使用 ${allowedNames}`, decorator);
+        }
     });
 }
 exports.processDecoratorsByConfig = processDecoratorsByConfig;

package/out/natural/transforms/utils/parseDecorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseDecorator.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseDecorator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseDecorator.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseDecorator.ts"],"names":[],"mappings":";;;AAAA,uCAAoG;AACpG,0DAAkG;AAClG,wCAA6C;AAC7C,+DAA4D;AAE5D;;GAEG;AACH,SAAgB,mBAAmB,CAAC,gBAA6C,EAAE,IAAiB,EAAE,QAAgC,EAAE,UAA+B;IACrK,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAC1B,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAChG,IAAI,KAAU,CAAC;YACf,2DAA2D;YAC3D,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC/B,KAAK,GAAG,IAAA,mDAAgC,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACnE,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBAC7C,KAAK,GAAG,IAAI,CAAC;YACf,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAChD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YAC3B,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC/C,qBAAqB;gBACrB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAClC,MAAM,aAAa,GAAG,IAAA,yCAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;oBACxE,KAAK,GAAG,aAAa,CAAC;gBACxB,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC3B,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAChD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YAC3B,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACjD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC9B,KAAK,GAAG,IAAA,4CAAyB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,KAAK,eAAe,CAAC,EAAE,CAAC;oBACzE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAE,EAA+B,CAAC,KAAK,CAAC,CAAC;gBAChF,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,wBAAwB,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAClD,KAAK,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;YACpC,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAClD,MAAM,GAAG,GAA2B,EAAE,CAAC;gBACvC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;oBACtC,IAAI,CAAC,CAAC,IAAI,KAAK,gBAAgB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;wBACnG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;oBAClC,CAAC;gBACH,CAAC;gBACD,KAAK,GAAG,GAAG,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,eAAe,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YACvE,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YACzD,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,cAAc,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAnDD,kDAmDC;AAeD;;GAEG;AACU,QAAA,gBAAgB,GAA8F;IACvH,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;CAC7F,CAAC;AAEF;;GAEG;AACU,QAAA,yBAAyB,GAAuJ;IACzL,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,IAAI,GAAG,CAAC;QACjB,OAAO;QACP,aAAa;QACb,MAAM;QACN,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,QAAQ;QACR,OAAO;QACP,gBAAgB;QAChB,UAAU;KACb,CAAC;IACF,QAAQ,EAAE;QACN,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,wBAAwB;KACnC;CACJ,CAAC;AAEF;;GAEG;AACU,QAAA,yBAAyB,GAAqB;IACvD,IAAI,EAAE,gBAAgB;IACtB,aAAa,EAAE,CAAC,SAAS,EAAE,QAAkC,EAAE,UAAU,EAAE,EAAE;QACzE,MAAM,mBAAmB,GAAG,SAAS,CAAC,UAAU,CAAC;QACjD,IAAI,mBAAmB,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAChD,MAAM,cAAc,GAAG,mBAAmB,CAAC,cAAc,CAAC;YAC1D,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACnF,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAmC,CAAC;gBACjF,MAAM,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;gBACtE,MAAM,cAAc,GAAI,aAAa,CAAC,UAAyC,CAAC,QAAsC,CAAC;gBACvH,MAAM,cAAc,GAAG,IAAA,gBAAQ,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;gBACjE,IAAA,yBAAe,EAAC,cAAc,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBACvD,MAAM,iBAAiB,GAAG,IAAA,gBAAQ,EAAC,cAAc,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;gBACnE,QAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;gBAC/C,QAAQ,CAAC,cAAc,GAAG,cAAc,CAAC;gBACzC,QAAQ,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACrE,CAAC;YACD,MAAM,GAAG,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC7C,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACtC,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,EAA2B,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC;YACpC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAA,kBAAU,EAAC,UAAU,EAAE,2BAA2B,EAAE,SAAS,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;CACJ,CAAC;AAEF;;GAEG;AACU,QAAA,cAAc,GAA4D;IACnF,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;IAC3D,QAAQ,EAAE;QACN,KAAK,EAAE,OAAO;KACjB;CACJ,CAAC;AAEF;;GAEG;AACU,QAAA,mBAAmB,GAA4D;IACxF,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;CAC9D,CAAC;AAEF;;GAEG;AACU,QAAA,eAAe,GAAoG;IAC5H,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;CACpG,CAAC;AAEF;;GAEG;AACU,QAAA,oBAAoB,GAAkF;IAC/G,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;CACnF,CAAC;AAEF;;GAEG;AACU,QAAA,kBAAkB,GAAsD;IACjF,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;CACzD,CAAC;AAEF;;GAEG;AACU,QAAA,0BAA0B,GAAoC;IACvE,IAAI,EAAE,iBAAiB;IACvB,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACU,QAAA,2BAA2B,GAAqD;IACzF,IAAI,EAAE,kBAAkB;IACxB,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACrD,QAAQ,EAAE;QACN,YAAY,EAAE,YAAY;KAC7B;CACJ,CAAC;AAEF;;GAEG;AACU,QAAA,uBAAuB,GAAoE;IACpG,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;CACtE,CAAC;AAEF;;GAEG;AACU,QAAA,4BAA4B,GAA2D;IAChG,IAAI,EAAE,mBAAmB;IACzB,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC1D,QAAQ,EAAE;QACN,KAAK,EAAE,OAAO;KACjB;CACJ,CAAC;AAEF;;GAEG;AACU,QAAA,gBAAgB,GAAsD;IAC/E,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;CACzD,CAAC;AAEF;;;GAGG;AACH,SAAgB,yBAAyB,CACrC,UAA8C,EAC9C,QAAoC,EACpC,MAA0B,EAC1B,UAA+B;IAE/B,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEnD,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7B,MAAM,mBAAmB,GAAG,SAAS,CAAC,UAAU,CAAC;QACjD,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACzB,cAAc;YACd,IAAI,mBAAmB,CAAC,IAAI,KAAK,gBAAgB;gBAC7C,mBAAmB,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;gBAChD,mBAAmB,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC;gBACnD,OAAO,GAAG,IAAI,CAAC;gBACf,aAAa;gBACb,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;oBACxB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;gBACzD,CAAC;qBAAM,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,aAAa;oBAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBACvD,IAAI,aAAa,EAAE,CAAC;wBAChB,IAAI,aAAa,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;4BAC5C,MAAM,cAAc,GAAG,mBAAmB,CAAC,aAAa,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;4BAC7G,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gCACtC,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;oCACpC,sCAAsC;oCACtC,MAAM,QAAQ,GAAG,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC;oCAC7D,MAAc,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;gCACpD,CAAC;4BACL,CAAC,CAAC,CAAC;wBACP,CAAC;6BAAM,CAAC;4BACJ,IAAA,kBAAU,EAAC,UAAU,EAAE,uBAAuB,EAAE,aAAa,CAAC,CAAC;wBACnE,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,KAAK,gBAAgB;gBAC/D,mBAAmB,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;gBAChD,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI;gBACjC,CAAC,CAAC,IAAA,gBAAQ,EAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC;YACzC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/D,IAAA,kBAAU,EAAC,UAAU,EAAE,YAAY,aAAa,YAAY,YAAY,EAAE,EAAE,SAAS,CAAC,CAAC;QAC3F,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAlDD,8DAkDC"}

package/out/natural/transforms/utils/parseLogicBody.d.ts

@@ -0,0 +1,17 @@
+import { babelTypes, naslTypes, type ParseLogicState } from '../../utils';
+/**
+ * 解析函数体中的逻辑语句，填充 logic.body 和 logic.variables。
+ * 从 transform2Logic.ts Phase 2 提取，供所有 Logic 子类复用（Logic / AuthLogic / AuthLogicForCallInterface）。
+ *
+ * @param statements 函数体语句（未展平），内部自动调用 flattenStatementsWithComments
+ * @param logic 目标逻辑对象，需已初始化 body（含 Start）
+ * @param options parse 选项，需包含 logicType
+ * @returns returnDecorator（如有 $Return 装饰器）
+ */
+export declare function parseLogicBody(statements: babelTypes.Statement[], logic: naslTypes.Logic | naslTypes.OverriddenLogic, options: ParseLogicState & {
+    logicType?: string;
+    restrictDataQuery?: boolean;
+}): {
+    returnDecorator?: babelTypes.CallExpression;
+};
+//# sourceMappingURL=parseLogicBody.d.ts.map

package/out/natural/transforms/utils/parseLogicBody.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseLogicBody.d.ts","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseLogicBody.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAoB,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAI5F;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,CAAC,SAAS,EAAE,EAClC,KAAK,EAAE,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,eAAe,EAClD,OAAO,EAAE,eAAe,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7E;IAAE,eAAe,CAAC,EAAE,UAAU,CAAC,cAAc,CAAA;CAAE,CAiCjD"}

package/out/natural/transforms/utils/parseLogicBody.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseLogicBody = void 0;
+const utils_1 = require("../../utils");
+const transform2LogicItem_1 = require("../transform2LogicItem");
+const flattenStatementsWithComments_1 = require("./flattenStatementsWithComments");
+/**
+ * 解析函数体中的逻辑语句，填充 logic.body 和 logic.variables。
+ * 从 transform2Logic.ts Phase 2 提取，供所有 Logic 子类复用（Logic / AuthLogic / AuthLogicForCallInterface）。
+ *
+ * @param statements 函数体语句（未展平），内部自动调用 flattenStatementsWithComments
+ * @param logic 目标逻辑对象，需已初始化 body（含 Start）
+ * @param options parse 选项，需包含 logicType
+ * @returns returnDecorator（如有 $Return 装饰器）
+ */
+function parseLogicBody(statements, logic, options) {
+    let returnDecorator;
+    const flatStatements = (0, flattenStatementsWithComments_1.flattenStatementsWithComments)(statements, { nodeBeforeTrailing: true });
+    flatStatements.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)(flatStatements[index - 1], 'Variable');
+        }
+        const item = (0, transform2LogicItem_1.transform2LogicItem)(node, {
+            ...options,
+            transformType: 'logic',
+            logic,
+            logicType: options?.logicType || 'global_logic',
+            decorator: variableDecorator,
+        });
+        item && logic.body.push(item);
+    });
+    return { returnDecorator };
+}
+exports.parseLogicBody = parseLogicBody;
+//# sourceMappingURL=parseLogicBody.js.map

package/out/natural/transforms/utils/parseLogicBody.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseLogicBody.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseLogicBody.ts"],"names":[],"mappings":";;;AAAA,uCAA4F;AAC5F,gEAA6D;AAC7D,mFAAgF;AAEhF;;;;;;;;GAQG;AACH,SAAgB,cAAc,CAC5B,UAAkC,EAClC,KAAkD,EAClD,OAA8E;IAE9E,IAAI,eAAsD,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,6DAA6B,EAAC,UAAU,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/F,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACrC,uBAAuB;QACvB,IAAI,IAAA,wBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QACD,uCAAuC;QACvC,MAAM,mBAAmB,GAAG,IAAA,wBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,mBAAmB,EAAE,CAAC;YACxB,eAAe,GAAG,mBAAmB,CAAC;YACtC,OAAO;QACT,CAAC;QAED,+DAA+D;QAC/D,IAAI,iBAAwD,CAAC;QAC7D,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YACxC,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,cAAc,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAC9E,CAAC;QAED,MAAM,IAAI,GAAG,IAAA,yCAAmB,EAAC,IAAI,EAAE;YACrC,GAAG,OAAO;YACV,aAAa,EAAE,OAAO;YACtB,KAAK;YACL,SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,cAAc;YAC/C,SAAS,EAAE,iBAAiB;SAC7B,CAAC,CAAC;QACH,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC;AArCD,wCAqCC"}

package/out/natural/utils/index.d.ts

@@ -26,6 +26,10 @@ export interface ParseNaturalTSState {
     source?: string;
     componentsMap?: componentsMap;
     strictForTraining?: boolean;
+    /** 当前 app 中已定义的角色名列表，用于校验 bindRoles */
+    appRoles?: string[];
+    /** JSBlock 解析时查找外部 JS 文件内容 */
+    externalFiles?: Map<string, string>;
 }
 export interface ParseLogicState extends ParseNaturalTSState {
     isInFrontend?: boolean;
@@ -69,6 +73,7 @@ export declare function getDecoratorCall(statement: babelTypes.Statement | undef
 export declare function throwWarning(message: string, babelNode?: babelTypes.Node | string, babelNode2?: babelTypes.Node | string): void;
 export declare function tryParseTS(tsCode: string): import("@babel/parser").ParseResult<babel.types.File>;
 export declare function fetchFromComments(comments?: Array<babelTypes.Comment | babelTypes.CommentBlock>): string;
+export declare function fetchDescriptionFromComments(comments?: Array<babelTypes.Comment | babelTypes.CommentBlock>): string;
 export declare const genAIUID: (node: any, sessionId: string, num?: number) => {
     node: any;
     number: number;

package/out/natural/utils/index.d.ts.map

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

package/out/natural/utils/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genAIUID = exports.fetchFromComments = exports.tryParseTS = exports.throwWarning = exports.getDecoratorCall = exports.throwError = exports.ParseNaturalTSError = exports.parseNaturalTSErrorMap = exports.DEBUG = exports.createComponentLookupMap = exports.Camel2kebab = exports.kebab2Camel = exports.splitPath = exports.firstUpperCase = exports.firstLowerCase = exports.uuidv4 = exports.genHash = exports.generate = exports.naslTypes = exports.babelTypes = void 0;
+exports.genAIUID = exports.fetchDescriptionFromComments = exports.fetchFromComments = exports.tryParseTS = exports.throwWarning = exports.getDecoratorCall = exports.throwError = exports.ParseNaturalTSError = exports.parseNaturalTSErrorMap = exports.DEBUG = exports.createComponentLookupMap = exports.Camel2kebab = exports.kebab2Camel = exports.splitPath = exports.firstUpperCase = exports.firstLowerCase = exports.uuidv4 = exports.genHash = exports.generate = exports.naslTypes = exports.babelTypes = void 0;
 const babel = __importStar(require("@babel/core"));
 const babelTypes = __importStar(require("@babel/types"));
 exports.babelTypes = babelTypes;
@@ -184,6 +184,16 @@ function fetchFromComments(comments) {
     return processedLines.join(' ').replace(/\s+/g, ' ').trim();
 }
 exports.fetchFromComments = fetchFromComments;
+// 从注释中提取 description，兼容 4 种格式：
+// /** @description xxx */ /* @description xxx */ /** xxx */ /* xxx */
+function fetchDescriptionFromComments(comments) {
+    const raw = fetchFromComments(comments);
+    if (!raw)
+        return undefined;
+    const match = raw.match(/^@description\s+([\s\S]*)/);
+    return match ? match[1].trim() : raw;
+}
+exports.fetchDescriptionFromComments = fetchDescriptionFromComments;
 // 根据 sessionId 生成 _aiUID
 const genAIUID = (node, sessionId, num) => {
     let temp = node.elements;

package/out/natural/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/natural/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/natural/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,yDAA2C;AAMlC,gCAAU;AALnB,iEAAwC;AAKR,mBALzB,mBAAQ,CAKyB;AAJxC,0DAA4C;AAIvB,8BAAS;AAH9B,mDAAqC;AAKrC,oCAAoC;AACpC,qCAQqB;AAPnB,gGAAA,OAAO,OAAA;AACP,+FAAA,MAAM,OAAA;AACN,uGAAA,cAAc,OAAA;AACd,uGAAA,cAAc,OAAA;AACd,kGAAA,SAAS,OAAA;AACT,oGAAA,WAAW,OAAA;AACX,oGAAA,WAAW,OAAA;AAGb,yFAAwF;AAA/E,oIAAA,wBAAwB,OAAA;AAEjC,uEAAuE;AACvE,SAAgB,KAAK;IACnB,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,MAAM,CAAC;AACvD,CAAC;AAFD,sBAEC;AAEY,QAAA,sBAAsB,GAAkC,EAAE,CAAC;AAExE,MAAa,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;IACpC,CAAC;CACF;AALD,kDAKC;AAyCD;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,KAA0B,EAAE,OAAe,EAAE,SAAoC,EAAE,UAAqC;IACjJ,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,IAAI,gBAAgB,GAAG,GAAG,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QACzF,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YAC1C,gBAAgB,IAAI,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QAC/E,CAAC;QACD,OAAO,IAAI,eAAe,GAAG,gBAAgB,CAAC;IAChD,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,IAAI,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC;QAChF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACvB,OAAO,IAAI,gBAAgB,GAAG,aAAa,GAAG,YAAY,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,CAAC;QACvF,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,gBAAgB,GAAG,aAAa,CAAC;QAC9C,CAAC;IACH,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,IAAI,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC;QACnF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACvB,OAAO,IAAI,gBAAgB,GAAG,aAAa,GAAG,YAAY,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,CAAC;QACvF,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,gBAAgB,GAAG,aAAa,CAAC;QAC9C,CAAC;IACH,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,8BAAsB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACpE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,IAAI,KAAK,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE;gBACxC,OAAO,8BAAsB,CAAC,GAAG,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,8BAAsB,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,8BAAsB,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACvG,mBAAmB;QACnB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;AACH,CAAC;AAxCD,gCAwCC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,gBAAgB,CAC9B,SAA2C,EAC3C,aAAqB;IAErB,IAAI,SAAS,EAAE,IAAI,KAAK,qBAAqB;QACzC,SAAS,CAAC,UAAU,CAAC,IAAI,KAAK,gBAAgB;QAC9C,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;QACjD,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,aAAa,EAAE,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC,UAAU,CAAC;IAC9B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,4CAWC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,OAAe,EAAE,SAAoC,EAAE,UAAqC;IACvH,IAAI,KAAK,EAAE;QAAE,OAAO;IAEpB,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,IAAI,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC;QAChF,OAAO,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,IAAI,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC;QACnF,OAAO,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAZD,oCAYC;AAED,SAAgB,UAAU,CAAC,MAAc;IACvC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE;YACnC,QAAQ,EAAE,WAAW;YACrB,OAAO,EAAE,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC/C,CAAC,CAAC;QACH,6FAA6F;QAC7F,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAXD,gCAWC;AAED,SAAgB,iBAAiB,CAAC,QAA8D;IAC9F,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAE9C,8BAA8B;IAC9B,yBAAyB;IACzB,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxC,qBAAqB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,iBAAiB;IACjB,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9D,CAAC;AAdD,8CAcC;AAED,+BAA+B;AAC/B,sEAAsE;AACtE,SAAgB,4BAA4B,CAAC,QAA8D;IACzG,MAAM,GAAG,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACrD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACvC,CAAC;AALD,oEAKC;AAGD,yBAAyB;AAClB,MAAM,QAAQ,GAAG,CAAC,IAAS,EAAE,SAAiB,EAAE,GAAY,EAAE,EAAE;IACrE,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;IACzB,IAAI,IAAI,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,IAAI,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC;IACtB,KAAK,CAAC,QAAQ,CACZ,CAAC,EAAE,IAAI,EAAiB,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,GAAG,SAAS,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,MAAM,IAAI,CAAC,CAAC;QACd,CAAC;IACH,CAAC,EACD,EAAE,IAAI,EAAE,EACR,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,CACxC,CAAC;IACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAC1B,CAAC,CAAC;AApBW,QAAA,QAAQ,YAoBnB"}

package/out/natural/utils/nasl-file-types.d.ts

@@ -12,7 +12,7 @@ export interface NASLFileTypeConfig {
     /** 匹配代码引用的正则表达式模式（不含锚点和标志） */
     codeRefPattern: string;
     /** 文件扩展名 */
-    extension: 'ts' | 'tsx' | 'css';
+    extension: 'ts' | 'tsx' | 'css' | 'json';
 }
 /**
  * NASL 支持的所有文件类型配置
@@ -26,6 +26,11 @@ export declare function getFileNamePatterns(): RegExp[];
  * 获取用于提取代码引用的正则表达式数组
  */
 export declare function getCodeRefPatterns(): RegExp[];
+export declare const codeRefPatterns: RegExp[];
+/**
+ * 判断文件路径是否为 JSBlock 外部文件（tmp/*.js，仅支持 tmp/ 一级目录）
+ */
+export declare function isTmpJsFile(filePath: string): boolean;
 /**
  * 判断文件路径是否为已知的 NASL 文件类型
  * 支持的类型：

package/out/natural/utils/nasl-file-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nasl-file-types.d.ts","sourceRoot":"","sources":["../../../src/natural/utils/nasl-file-types.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,MAAM,WAAW,kBAAkB;IAC/B,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,6BAA6B;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,8BAA8B;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY;IACZ,SAAS,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;CACnC;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,kBAAkB,EAgE/C,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,EAAE,CAI9C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAI7C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIzD"}
+{"version":3,"file":"nasl-file-types.d.ts","sourceRoot":"","sources":["../../../src/natural/utils/nasl-file-types.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,MAAM,WAAW,kBAAkB;IACjC,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,6BAA6B;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,8BAA8B;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY;IACZ,SAAS,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;CAC1C;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,kBAAkB,EAiI/C,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,EAAE,CAE9C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAI7C;AAED,eAAO,MAAM,eAAe,UAAuB,CAAC;AAEpD;;GAEG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAQzD"}

package/out/natural/utils/nasl-file-types.js

@@ -23,12 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isKnownFileType = exports.getCodeRefPatterns = exports.getFileNamePatterns = exports.NASL_FILE_TYPES = void 0;
+exports.isKnownFileType = exports.isTmpJsFile = exports.codeRefPatterns = exports.getCodeRefPatterns = exports.getFileNamePatterns = exports.NASL_FILE_TYPES = void 0;
 const path = __importStar(require("path"));
 /**
  * NASL 支持的所有文件类型配置
  */
 exports.NASL_FILE_TYPES = [
+    {
+        name: 'roles',
+        description: '角色',
+        fileNamePattern: 'app\\.roles\\.json',
+        codeRefPattern: '',
+        extension: 'json',
+    },
     {
         name: 'structures',
         description: '数据结构',
@@ -85,6 +92,27 @@ exports.NASL_FILE_TYPES = [
         codeRefPattern: 'extensions\\.\\w+(?:\\.\\w+)*',
         extension: 'ts',
     },
+    {
+        name: 'apis',
+        description: 'API',
+        fileNamePattern: 'apis\\.\\w+\\.ts',
+        codeRefPattern: 'apis\\.\\w+(?:\\.\\w+)*',
+        extension: 'ts',
+    },
+    {
+        name: 'connectors',
+        description: '连接器',
+        fileNamePattern: 'connectors\\.\\w+\\.ts',
+        codeRefPattern: 'connectors\\.\\w+(?:\\.\\w+)*',
+        extension: 'ts',
+    },
+    {
+        name: 'uilibs',
+        description: 'UI 库',
+        fileNamePattern: 'uilibs\\.\\w+\\.ts',
+        codeRefPattern: 'uilibs\\.\\w+(?:\\.\\w+)*',
+        extension: 'ts',
+    },
     {
         name: 'theme',
         description: '主题样式',
@@ -92,6 +120,41 @@ exports.NASL_FILE_TYPES = [
         codeRefPattern: 'app\\.frontendTypes\\.\\w+\\.frontends\\.\\w+\\.theme\\.css',
         extension: 'css',
     },
+    {
+        name: 'configuration-custom',
+        description: '自定义配置',
+        fileNamePattern: 'app\\.configuration\\.custom\\.ts',
+        codeRefPattern: 'app\\.configuration\\.custom\\b',
+        extension: 'ts',
+    },
+    {
+        name: 'authLogicsForExportInterface',
+        description: '开放接口鉴权方式',
+        fileNamePattern: 'app\\.authLogicsForExportInterface\\.\\w+\\.ts',
+        codeRefPattern: 'app\\.authLogicsForExportInterface\\.\\w+',
+        extension: 'ts',
+    },
+    {
+        name: 'authLogicsForCallInterface',
+        description: '外部接口鉴权方式',
+        fileNamePattern: 'app\\.authLogicsForCallInterface\\.\\w+\\.ts',
+        codeRefPattern: 'app\\.authLogicsForCallInterface\\.\\w+',
+        extension: 'ts',
+    },
+    {
+        name: 'exportInterfaces',
+        description: '开放接口',
+        fileNamePattern: 'app\\.exportInterfaces\\.\\w+\\.ts',
+        codeRefPattern: 'app\\.exportInterfaces\\.\\w+',
+        extension: 'ts',
+    },
+    {
+        name: 'overriddenLogics',
+        description: '覆写逻辑',
+        fileNamePattern: 'app\\.overridden\\.\\w+\\.logics\\.\\w+\\.ts',
+        codeRefPattern: 'app\\.overridden\\.\\w+\\.logics\\.\\w+',
+        extension: 'ts',
+    },
 ];
 /**
  * 获取用于验证文件名的正则表达式数组
@@ -104,9 +167,17 @@ exports.getFileNamePatterns = getFileNamePatterns;
  * 获取用于提取代码引用的正则表达式数组
  */
 function getCodeRefPatterns() {
-    return exports.NASL_FILE_TYPES.map((type) => new RegExp(type.codeRefPattern, 'g'));
+    return exports.NASL_FILE_TYPES.filter((type) => type.codeRefPattern).map((type) => new RegExp(type.codeRefPattern, 'g'));
 }
 exports.getCodeRefPatterns = getCodeRefPatterns;
+exports.codeRefPatterns = getCodeRefPatterns();
+/**
+ * 判断文件路径是否为 JSBlock 外部文件（tmp/*.js，仅支持 tmp/ 一级目录）
+ */
+function isTmpJsFile(filePath) {
+    return /^tmp\/[^/]+\.js$/.test(filePath.replace(/\\/g, '/'));
+}
+exports.isTmpJsFile = isTmpJsFile;
 /**
  * 判断文件路径是否为已知的 NASL 文件类型
  * 支持的类型：
@@ -123,6 +194,10 @@ exports.getCodeRefPatterns = getCodeRefPatterns;
  * @returns 是否为已知的 NASL 文件类型
  */
 function isKnownFileType(filePath) {
+    // 支持 tmp/*.js 文件（JSBlock 外部文件）
+    if (isTmpJsFile(filePath)) {
+        return true;
+    }
     // 提取文件名
     const fileName = path.basename(filePath);
     return getFileNamePatterns().some((pattern) => pattern.test(fileName));

package/out/natural/utils/nasl-file-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"nasl-file-types.js","sourceRoot":"","sources":["../../../src/natural/utils/nasl-file-types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAmB7B;;GAEG;AACU,QAAA,eAAe,GAAyB;IACjD;QACI,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,MAAM;QACnB,eAAe,EAAE,8BAA8B;QAC/C,cAAc,EAAE,qCAAqC;QACrD,SAAS,EAAE,IAAI;KAClB;IACD;QACI,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,IAAI;QACjB,eAAe,EAAE,iDAAiD;QAClE,cAAc,EAAE,mEAAmE;QACnF,SAAS,EAAE,IAAI;KAClB;IACD;QACI,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,IAAI;QACjB,eAAe,EAAE,0BAA0B;QAC3C,cAAc,EAAE,iCAAiC;QACjD,SAAS,EAAE,IAAI;KAClB;IACD;QACI,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,IAAI;QACjB,eAAe,EAAE,+EAA+E;QAChG,cAAc,EAAE,qFAAqF;QACrG,SAAS,EAAE,KAAK;KACnB;IACD;QACI,IAAI,EAAE,mBAAmB;QACzB,WAAW,EAAE,QAAQ;QACrB,eAAe,EAAE,gCAAgC;QACjD,cAAc,EAAE,uCAAuC;QACvD,SAAS,EAAE,IAAI;KAClB;IACD;QACI,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EAAE,QAAQ;QACrB,eAAe,EAAE,gEAAgE;QACjF,cAAc,EAAE,uEAAuE;QACvF,SAAS,EAAE,IAAI;KAClB;IACD;QACI,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,IAAI;QACjB,eAAe,EAAE,yBAAyB;QAC1C,cAAc,EAAE,gCAAgC;QAChD,SAAS,EAAE,IAAI;KAClB;IACD;QACI,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,wBAAwB;QACzC,cAAc,EAAE,+BAA+B;QAC/C,SAAS,EAAE,IAAI;KAClB;IACD;QACI,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,MAAM;QACnB,eAAe,EAAE,6DAA6D;QAC9E,cAAc,EAAE,6DAA6D;QAC7E,SAAS,EAAE,KAAK;KACnB;CACJ,CAAC;AAEF;;GAEG;AACH,SAAgB,mBAAmB;IAC/B,OAAO,uBAAe,CAAC,GAAG,CACtB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,eAAe,GAAG,CAAC,CACpD,CAAC;AACN,CAAC;AAJD,kDAIC;AAED;;GAEG;AACH,SAAgB,kBAAkB;IAC9B,OAAO,uBAAe,CAAC,GAAG,CACtB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CACjD,CAAC;AACN,CAAC;AAJD,gDAIC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,eAAe,CAAC,QAAgB;IAC5C,QAAQ;IACR,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,mBAAmB,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC3E,CAAC;AAJD,0CAIC"}
+{"version":3,"file":"nasl-file-types.js","sourceRoot":"","sources":["../../../src/natural/utils/nasl-file-types.ts"],"names":[],"mappings":"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"}

package/out/server/extendBaseNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extendBaseNode.d.ts","sourceRoot":"","sources":["../../src/server/extendBaseNode.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAsBR,cAAc,EAYf,MAAM,qBAAqB,CAAC;AA0W7B;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,SAAgB,QAAQ,qBAsCrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,SAAgB,QAAQ,qBAkCtE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,SAAgB,QAAQ,qBAuB7D,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,SAAgB,QAAQ,qBAE5D,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,uCAAuC,SAAU,cAAc,SAqD3E,CAAC"}
+{"version":3,"file":"extendBaseNode.d.ts","sourceRoot":"","sources":["../../src/server/extendBaseNode.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAsBR,cAAc,EAYf,MAAM,qBAAqB,CAAC;AA4W7B;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,SAAgB,QAAQ,qBAsCrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,SAAgB,QAAQ,qBAkCtE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,SAAgB,QAAQ,qBAuB7D,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,SAAgB,QAAQ,qBAE5D,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,uCAAuC,SAAU,cAAc,SAqD3E,CAAC"}

package/out/server/extendBaseNode.js

@@ -193,7 +193,8 @@ nasl_concepts_1.BaseNode.prototype.changeName = async function changeName(newVal
                 || nasl_concepts_2.asserts.isStructure(this)
                 || nasl_concepts_2.asserts.isEnum(this)
                 || nasl_concepts_2.asserts.isVariable(this)
-                || nasl_concepts_2.asserts.isBusinessComponent(this)) && this.directory) {
+                || nasl_concepts_2.asserts.isBusinessComponent(this)
+                || nasl_concepts_2.asserts.isProcessV2(this)) && this.directory) {
                 handleDirectoryRename(this, newValue);
             }
             else
@@ -285,7 +286,8 @@ nasl_concepts_1.BaseNode.prototype.changeName = async function changeName(newVal
                         || nasl_concepts_2.asserts.isStructure(this)
                         || nasl_concepts_2.asserts.isEnum(this)
                         || nasl_concepts_2.asserts.isVariable(this)
-                        || nasl_concepts_2.asserts.isBusinessComponent(this)) && this.directory) {
+                        || nasl_concepts_2.asserts.isBusinessComponent(this)
+                        || nasl_concepts_2.asserts.isProcessV2(this)) && this.directory) {
                         handleDirectoryRename(this, newValue);
                     }
                     else {
@@ -572,6 +574,7 @@ nasl_concepts_1.BaseNode.prototype.prepareDelete = async function prepareDelete(
                 '_events',
                 '_collectingList',
                 '_historyList',
+                '__preInstantiatedHelper',
             ]);
             (0, utils_1.traverse)((current) => {
                 const currentNode = current.node;
@@ -660,7 +663,7 @@ nasl_concepts_1.BaseNode.prototype.prepareDelete = async function prepareDelete(
                     this.app.emit('collect:end');
                 }
                 else if (node instanceof nasl_concepts_1.Entity || node instanceof nasl_concepts_1.Enum || node instanceof nasl_concepts_1.Logic ||
-                    node instanceof nasl_concepts_1.Variable || node instanceof nasl_concepts_1.BusinessComponent) {
+                    node instanceof nasl_concepts_1.Variable || node instanceof nasl_concepts_1.BusinessComponent || node instanceof nasl_concepts_1.ProcessV2) {
                     this.app.emit('collect:start', {
                         actionMsg: getActionMsg(node),
                     });
@@ -923,6 +926,9 @@ nasl_concepts_1.BaseNode.prototype.prepareDelete = async function prepareDelete(
                         actionMsg: `删除流程${node.name}`,
                     });
                     this.delete();
+                    if (node.directory) {
+                        updateDirectoryDefinitions(node, node.directory);
+                    }
                     App.emit('collect:end');
                     if (cb) {
                         cb();