npm - @lcap/nasl - Versions diffs - 4.5.0-beta.1 → 4.5.0-beta.2 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (229) hide show

package/out/natural/transforms/transform2Param.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Param.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Param.ts"],"names":[],"mappings":";;;AAAA,oCAA6D;AAC7D,yEAAsE;AACtE,+DAA8E;~~AAE9E~~,SAAgB,eAAe,CAC7B,IAIkC,EAClC,OAAyB;AACzB,+BAA+B;AAC/B,yBAAmC;~~IAEnC~~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~~AA5GD~~,~~0CA4GC~~"}
1	+ {"version":3,"file":"transform2Param.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Param.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2Roles.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { babelTypes, naslTypes, type ParseNaturalTSState } from '../utils';
+export declare function transform2Roles(arg: babelTypes.ArrayExpression, app: naslTypes.App, parseState: ParseNaturalTSState): void;
+//# sourceMappingURL=transform2Roles.d.ts.map

package/out/natural/transforms/transform2Roles.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"transform2Roles.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAc,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAEvF,wBAAgB,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,eAAe,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI,CA8B1H"}

package/out/natural/transforms/transform2Roles.js ADDED Viewed

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transform2Roles = void 0;
+const utils_1 = require("../utils");
+function transform2Roles(arg, app, parseState) {
+    arg.elements.forEach((el) => {
+        if (el?.type !== 'ObjectExpression')
+            return;
+        const findProp = (key) => el.properties.find((p) => p.type === 'ObjectProperty' && ((p.key.type === 'Identifier' && p.key.name === key) ||
+            (p.key.type === 'StringLiteral' && p.key.value === key)));
+        const nameProp = findProp('name');
+        const descProp = findProp('description');
+        const uuidProp = findProp('uuid');
+        const titleProp = findProp('title');
+        const name = nameProp?.value.type === 'StringLiteral'
+            ? nameProp.value.value
+            : undefined;
+        if (!name) {
+            return (0, utils_1.throwError)(parseState, '角色对象缺少有效的 name 字段（应为字符串）', el);
+        }
+        const description = descProp?.value.type === 'StringLiteral'
+            ? descProp.value.value
+            : '';
+        const uuid = uuidProp?.value.type === 'StringLiteral'
+            ? uuidProp.value.value
+            : undefined;
+        const title = titleProp?.value.type === 'StringLiteral'
+            ? titleProp.value.value
+            : undefined;
+        app.roles.push(new utils_1.naslTypes.Role({ name, description, ...(uuid ? { uuid } : {}), ...(title ? { title } : {}) }));
+    });
+}
+exports.transform2Roles = transform2Roles;
+//# sourceMappingURL=transform2Roles.js.map

package/out/natural/transforms/transform2Roles.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"transform2Roles.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Roles.ts"],"names":[],"mappings":";;;AAAA,oCAAuF;AAEvF,SAAgB,eAAe,CAAC,GAA+B,EAAE,GAAkB,EAAE,UAA+B;IAClH,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QAC1B,IAAI,EAAE,EAAE,IAAI,KAAK,kBAAkB;YAAE,OAAO;QAC5C,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAkC,EAAE,CACzF,CAAC,CAAC,IAAI,KAAK,gBAAgB,IAAI,CAC7B,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,IAAK,CAAC,CAAC,GAA6B,CAAC,IAAI,KAAK,GAAG,CAAC;YAC9E,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,eAAe,IAAK,CAAC,CAAC,GAAgC,CAAC,KAAK,KAAK,GAAG,CAAC,CACtF,CACF,CAAC;QACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,QAAQ,EAAE,KAAK,CAAC,IAAI,KAAK,eAAe;YACnD,CAAC,CAAE,QAAQ,CAAC,KAAkC,CAAC,KAAK;YACpD,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,WAAW,GAAG,QAAQ,EAAE,KAAK,CAAC,IAAI,KAAK,eAAe;YAC1D,CAAC,CAAE,QAAQ,CAAC,KAAkC,CAAC,KAAK;YACpD,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,IAAI,GAAG,QAAQ,EAAE,KAAK,CAAC,IAAI,KAAK,eAAe;YACnD,CAAC,CAAE,QAAQ,CAAC,KAAkC,CAAC,KAAK;YACpD,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,KAAK,GAAG,SAAS,EAAE,KAAK,CAAC,IAAI,KAAK,eAAe;YACrD,CAAC,CAAE,SAAS,CAAC,KAAkC,CAAC,KAAK;YACrD,CAAC,CAAC,SAAS,CAAC;QACd,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpH,CAAC,CAAC,CAAC;AACL,CAAC;AA9BD,0CA8BC"}

package/out/natural/transforms/transform2Structure.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Structure.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Structure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAiC,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;~~AAS1G~~,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,SAAS,~~CAc3H~~"}
1	+ {"version":3,"file":"transform2Structure.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Structure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAiC,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAU1G,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,SAAS,CAe3H"}

package/out/natural/transforms/transform2Structure.js CHANGED Viewed

@@ -5,9 +5,11 @@ const utils_1 = require("../utils");
 const checkDefaultValue_1 = require("./checker/checkDefaultValue");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
 const parseDecorator_1 = require("./utils/parseDecorator");
+const checker_1 = require("./checker");
 function transform2Structure(node, parseState) {
     const structure = new utils_1.naslTypes.Structure();
     parseState.nodeName = structure.name = node.id.name;
+    (0, checker_1.checkStructureName)(structure.name, parseState, node);
     structure.description = (0, utils_1.fetchFromComments)(node.leadingComments);
     (0, parseDecorator_1.processDecoratorsByConfig)(node.decorators, [parseDecorator_1.STRUCTURE_DECORATOR], structure, parseState);
     node.body.body.forEach((node) => {

package/out/natural/transforms/transform2Structure.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Structure.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Structure.ts"],"names":[],"mappings":";;;AAAA,oCAA0G;AAC1G,mEAAgE;AAChE,yEAAsE;AACtE,2DAIgC;~~AAEhC~~,SAAgB,mBAAmB,CAAC,IAAiC,EAAE,UAA+B;IAClG,MAAM,SAAS,GAAG,IAAI,iBAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IACpD,SAAS,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAEhE,IAAA,0CAAyB,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC,oCAAmB,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAEzF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAChC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACrB,CAAC;~~AAdD~~,~~kDAcC~~;AAED,SAAS,2BAA2B,CAAC,IAA8B,EAAE,UAA+B;IAChG,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,iBAAiB,EAAE,CAAC;IACnD,QAAQ,CAAC,IAAI,GAAI,IAAI,CAAC,GAA6B,CAAC,IAAI,CAAC;IACzD,QAAQ,CAAC,KAAK,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACvF,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAE,IAAI,CAAC,cAA8C,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC;IAEjJ,QAAQ;IACR,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,IAAA,qCAAiB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QACxF,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC;QACvC,CAAC;IACH,CAAC;IAED,IAAA,0CAAyB,EACrB,IAAI,CAAC,UAAU,EACf,CAAC,6CAA4B,CAAC,EAC9B,QAAQ,EACR,UAAU,CACb,CAAC;IAEF,OAAO,QAAQ,CAAC;AACpB,CAAC"}
1	+ {"version":3,"file":"transform2Structure.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Structure.ts"],"names":[],"mappings":";;;AAAA,oCAA0G;AAC1G,mEAAgE;AAChE,yEAAsE;AACtE,2DAIgC;AAChC,uCAA+C;AAE/C,SAAgB,mBAAmB,CAAC,IAAiC,EAAE,UAA+B;IAClG,MAAM,SAAS,GAAG,IAAI,iBAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IACpD,IAAA,4BAAkB,EAAC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACrD,SAAS,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAEhE,IAAA,0CAAyB,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC,oCAAmB,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAEzF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAChC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACrB,CAAC;AAfD,kDAeC;AAED,SAAS,2BAA2B,CAAC,IAA8B,EAAE,UAA+B;IAChG,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,iBAAiB,EAAE,CAAC;IACnD,QAAQ,CAAC,IAAI,GAAI,IAAI,CAAC,GAA6B,CAAC,IAAI,CAAC;IACzD,QAAQ,CAAC,KAAK,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACvF,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAE,IAAI,CAAC,cAA8C,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC;IAEjJ,QAAQ;IACR,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,IAAA,qCAAiB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QACxF,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC;QACvC,CAAC;IACH,CAAC;IAED,IAAA,0CAAyB,EACrB,IAAI,CAAC,UAAU,EACf,CAAC,6CAA4B,CAAC,EAC9B,QAAQ,EACR,UAAU,CACb,CAAC;IAEF,OAAO,QAAQ,CAAC;AACpB,CAAC"}

package/out/natural/transforms/transform2TypeAnnotation.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2TypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,~~EAAwB~~,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;~~AAEjG~~,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,cAAc,GAAG,IAAI,~~CA2HlI~~"}
1	+ {"version":3,"file":"transform2TypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAsD,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/H,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,cAAc,GAAG,IAAI,CA8HlI"}

package/out/natural/transforms/transform2TypeAnnotation.js CHANGED Viewed

@@ -96,10 +96,14 @@ function transform2TypeAnnotation(node, parseState) {
         return (0, utils_1.throwError)(parseState, `Unhandled node ${node.type}`);
     }
     else if (node.type === 'TSTypeLiteral') {
-        return utils_1.naslTypes.TypeAnnotation.createTypeAnonymousStructure(node.members.map((member) => new utils_1.naslTypes.StructureProperty({
-            name: member.key.name,
-            typeAnnotation: transform2TypeAnnotation(member.typeAnnotation.typeAnnotation, parseState) || undefined,
-        })));
+        return utils_1.naslTypes.TypeAnnotation.createTypeAnonymousStructure(node.members.map((member) => {
+            const description = (0, utils_1.fetchDescriptionFromComments)(member.leadingComments);
+            return new utils_1.naslTypes.StructureProperty({
+                name: member.key.name,
+                description: description || undefined,
+                typeAnnotation: transform2TypeAnnotation(member.typeAnnotation.typeAnnotation, parseState) || undefined,
+            });
+        }));
     }
     else if (node.type === 'TSBooleanKeyword') {
         return utils_1.naslTypes.TypeAnnotation.createPrimitive('Boolean');

package/out/natural/transforms/transform2TypeAnnotation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2TypeAnnotation.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":";;;AAAA,~~oCAAiG~~;~~AAEjG~~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~~CACzC~~,IAAI,iBAAS,CAAC,iBAAiB,CAAC;~~YAC9B~~,IAAI,EAAG,MAAM,CAAC,GAA6B,CAAC,IAAI;~~YAChD~~,cAAc,EAAE,wBAAwB,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS;~~SACxG~~,CAAC,~~CACL~~,CACF,CAAC;IACJ,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAC5C,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC3C,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC3C,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChE,KAAK,CAAC,aAAa,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;~~AA3HD~~,~~4DA2HC~~"}
1	+ {"version":3,"file":"transform2TypeAnnotation.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2Variable.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Variable.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAc,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;~~AAKvF~~,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,mBAAmB,GAC3B,SAAS,CAAC,QAAQ,EAAE,~~CAyCtB~~;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,UAAU,EAAE,mBAAmB,GAC9B,SAAS,CAAC,eAAe,GAAG,IAAI,~~CAkClC~~;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,UAAU,EAAE,mBAAmB,GAC9B,SAAS,CAAC,gBAAgB,GAAG,IAAI,~~CAsCnC~~"}
1	+ {"version":3,"file":"transform2Variable.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAc,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAMvF,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,mBAAmB,GAC3B,SAAS,CAAC,QAAQ,EAAE,CA0CtB;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,UAAU,EAAE,mBAAmB,GAC9B,SAAS,CAAC,eAAe,GAAG,IAAI,CAmClC;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,UAAU,EAAE,mBAAmB,GAC9B,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAuCnC"}

package/out/natural/transforms/transform2Variable.js CHANGED Viewed

@@ -5,11 +5,13 @@ const utils_1 = require("../utils");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
 const transform2LogicItem_1 = require("./transform2LogicItem");
 const parseDecorator_1 = require("./utils/parseDecorator");
+const checker_1 = require("./checker");
 function transform2Variables(node, decorator, options) {
     const variables = [];
     const declList = node?.declarations || [];
     declList.forEach((decl) => {
         const variableName = decl.id.name;
+        (0, checker_1.checkIdentifierName)(variableName, '变量', options, decl.id);
         let typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(decl.id.typeAnnotation?.typeAnnotation, options) || undefined;
         const variable = new utils_1.naslTypes.Variable({
             name: variableName,
@@ -50,6 +52,7 @@ function transform2BackendVariable(node, decorator, parseState) {
         scope: 'request',
     });
     variable.name = id.name;
+    (0, checker_1.checkIdentifierName)(id.name, '变量', parseState, id);
     // 处理装饰器中的 description
     if (decorator && decorator.arguments[0]?.type === 'ObjectExpression') {
         const metadata = (0, parseDecorator_1.pickDecoratorObject)(decorator.arguments[0], parseDecorator_1.BACKEND_VARIABLE_DECORATOR.allowedKeys, parseDecorator_1.BACKEND_VARIABLE_DECORATOR.mappings || {}, parseState);
@@ -80,6 +83,7 @@ function transform2FrontendVariable(node, decorator, parseState) {
         localCache: false,
     });
     variable.name = id.name;
+    (0, checker_1.checkIdentifierName)(id.name, '变量', parseState, id);
     // 处理装饰器中的 description 和 localStorage (映射到 localCache)
     if (decorator && decorator.arguments[0]?.type === 'ObjectExpression') {
         const metadata = (0, parseDecorator_1.pickDecoratorObject)(decorator.arguments[0], parseDecorator_1.FRONTEND_VARIABLE_DECORATOR.allowedKeys, parseDecorator_1.FRONTEND_VARIABLE_DECORATOR.mappings || {}, parseState);

package/out/natural/transforms/transform2Variable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Variable.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":";;;AAAA,oCAAuF;AACvF,yEAAsE;AACtE,+DAA4D;AAC5D,2DAA+I;~~AAE~~/I,SAAgB,mBAAmB,CACjC,IAAoC,EACpC,SAAgD,EAChD,OAA4B;IAE5B,MAAM,SAAS,GAAyB,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,YAAY,GAAI,IAAI,CAAC,EAA4B,CAAC,IAAI,CAAC;~~QAE7D~~,IAAI,cAAc,GAAG,IAAA,mDAAwB,EAAG,IAAI,CAAC,EAA4B,CAAC,cAA8C,EAAE,cAAc,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC;QACxK,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,QAAQ,CAAC;YACtC,IAAI,EAAE,YAAY;YAClB,cAAc;SACf,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,QAAQ,CAAC,YAAY,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC;gBACjD,UAAU,EAAE,IAAA,yCAAmB,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;aAC1I,CAAC,CAAC;QACL,CAAC;QAED,mBAAmB;QACnB,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACrE,MAAM,gBAAgB,GAAG,IAAA,oCAAmB,EAC1C,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,wCAAuB,CAAC,WAAW,EACnC,wCAAuB,CAAC,QAAQ,IAAI,EAAE,EACtC,OAAO,CACR,CAAC;YAEF,IAAI,gBAAgB,CAAC,WAAW,EAAE,CAAC;gBACjC,QAAQ,CAAC,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC;YACtD,CAAC;YACD,IAAI,gBAAgB,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5C,QAAgB,CAAC,cAAc,GAAG,gBAAgB,CAAC,SAAS,CAAC;YAChE,CAAC;YACD,wCAAwC;YACxC,IAAI,gBAAgB,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC5C,OAAO,QAAQ,CAAC,cAAc,CAAC;YACjC,CAAC;QACH,CAAC;QAED,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC;~~AA7CD~~,~~kDA6CC~~;AAED,SAAgB,yBAAyB,CACvC,IAAoC,EACpC,SAAgD,EAChD,UAA+B;IAE7B,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,sDAAsD,CAAC,CAAC;IAC1H,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACxC,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,sCAAsC,CAAC,CAAC;IAC/G,MAAM,EAAE,GAAG,UAAU,CAAC,EAA2B,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,eAAe,CAAC;QAC3C,KAAK,EAAE,SAAS;KACnB,CAAC,CAAC;IACH,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;~~IAExB~~,sBAAsB;IACtB,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACrE,MAAM,QAAQ,GAAG,IAAA,oCAAmB,EAClC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,2CAA0B,CAAC,WAAW,EACtC,2CAA0B,CAAC,QAAQ,IAAI,EAAE,EACzC,UAAU,CACX,CAAC;QACF,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAI,EAAE,CAAC,cAA8C,EAAE,cAAc,CAAC;IAC1F,IAAI,cAAc,EAAE,CAAC;QACjB,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC;IAChG,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QAClB,QAAQ,CAAC,YAAY,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC;YAC/C,UAAU,EAAE,IAAA,yCAAmB,EAAC,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;SAC7F,CAAC,CAAC;IACP,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;~~AAtCD~~,~~8DAsCC~~;AAED,SAAgB,0BAA0B,CACxC,IAAoC,EACpC,SAAgD,EAChD,UAA+B;IAE7B,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,sDAAsD,CAAC,CAAC;IAC1H,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACxC,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,sCAAsC,CAAC,CAAC;IAC/G,MAAM,EAAE,GAAG,UAAU,CAAC,EAA2B,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,gBAAgB,CAAC;QAC5C,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;~~IAExB~~,sDAAsD;IACtD,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACrE,MAAM,QAAQ,GAAG,IAAA,oCAAmB,EAClC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,4CAA2B,CAAC,WAAW,EACvC,4CAA2B,CAAC,QAAQ,IAAI,EAAE,EAC1C,UAAU,CACX,CAAC;QACF,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC9C,CAAC;QACD,gDAAgD;QAChD,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACtC,QAAQ,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAI,EAAE,CAAC,cAA8C,EAAE,cAAc,CAAC;IAC1F,IAAI,cAAc,EAAE,CAAC;QACjB,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC;IAChG,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QAClB,QAAQ,CAAC,YAAY,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC;YAC/C,UAAU,EAAE,IAAA,yCAAmB,EAAC,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;SAC7F,CAAC,CAAC;IACP,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;~~AA1CD~~,~~gEA0CC~~"}
1	+ {"version":3,"file":"transform2Variable.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/utils/createComponentLookupMap.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createComponentLookupMap = void 0;
-const index_1 = require("../../index");
+const nasl_utils_1 = require("@lcap/nasl-utils");
 /**
  * 转换 allNodesAPI 为快速查找的 Map 结构
  * @param nodesAPI 原始的组件API定义
@@ -24,7 +24,7 @@ function createComponentLookupMap(nodesAPI) {
         if (component.events?.length) {
             for (let i = 0; i < component.events.length; i++) {
                 const event = component.events[i];
-                const name = `on${(0, index_1.firstUpperCase)(event.name.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase()))}`;
+                const name = `on${(0, nasl_utils_1.firstUpperCase)(event.name.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase()))}`;
                 eventsMap.set(name, event);
                 eventNames += i === 0 ? name : `, ${name}`;
             }
@@ -34,7 +34,7 @@ function createComponentLookupMap(nodesAPI) {
         if (component.slots?.length) {
             for (let i = 0; i < component.slots.length; i++) {
                 const slot = component.slots[i];
-                const name = `slot${(0, index_1.firstUpperCase)(slot.name)}`;
+                const name = `slot${(0, nasl_utils_1.firstUpperCase)(slot.name)}`;
                 slotsMap.set(name, slot);
                 slotNames += i === 0 ? name : `, ${name}`;
             }

package/out/natural/transforms/utils/createComponentLookupMap.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createComponentLookupMap.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/createComponentLookupMap.ts"],"names":[],"mappings":";;;AAAA,~~uCAA6C~~;~~AA4B7C~~;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,QAAkB;IACzD,MAAM,SAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;IAEzD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE;QACxD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAChC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC9B,UAAU,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACvD,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC5B,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,KAAK,IAAA,~~sBAAc~~,EAC9B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAM,EAAE,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAClF,EAAE,CAAC;gBACJ,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC3B,UAAU,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAChC,MAAM,IAAI,GAAG,OAAO,IAAA,~~sBAAc~~,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChD,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACzB,SAAS,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE;YACrB,SAAS,EAAE;gBACT,QAAQ,EAAE,SAAS,EAAE,QAAQ;gBAC7B,UAAU;gBACV,UAAU;gBACV,SAAS;aACV;YACD,QAAQ;YACR,SAAS;YACT,QAAQ;SACT,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC;AApDD,4DAoDC"}
1	+ {"version":3,"file":"createComponentLookupMap.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/createComponentLookupMap.ts"],"names":[],"mappings":";;;AAAA,iDAAkD;AA4BlD;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,QAAkB;IACzD,MAAM,SAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;IAEzD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE;QACxD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAChC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC9B,UAAU,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACvD,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC5B,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,KAAK,IAAA,2BAAc,EAC9B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAM,EAAE,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAClF,EAAE,CAAC;gBACJ,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC3B,UAAU,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAChC,MAAM,IAAI,GAAG,OAAO,IAAA,2BAAc,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChD,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACzB,SAAS,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE;YACrB,SAAS,EAAE;gBACT,QAAQ,EAAE,SAAS,EAAE,QAAQ;gBAC7B,UAAU;gBACV,UAAU;gBACV,SAAS;aACV;YACD,QAAQ;YACR,SAAS;YACT,QAAQ;SACT,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC;AApDD,4DAoDC"}

package/out/natural/transforms/utils/ensureBindRoles.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+import { babelTypes, type ParseNaturalTSState } from '../../utils';
+/**
+ * auth 为真时确保 bindRoles 包含 DEV-AdminRole 兜底角色，并校验角色合法性
+ */
+export declare function ensureBindRoles(target: {
+    auth?: unknown;
+    bindRoles?: string[];
+}, options: ParseNaturalTSState, node?: babelTypes.Node): undefined;
+//# sourceMappingURL=ensureBindRoles.d.ts.map

package/out/natural/transforms/utils/ensureBindRoles.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"ensureBindRoles.d.ts","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/ensureBindRoles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAc,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE/E;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,EAChD,OAAO,EAAE,mBAAmB,EAC5B,IAAI,CAAC,EAAE,UAAU,CAAC,IAAI,aAmBvB"}

package/out/natural/transforms/utils/ensureBindRoles.js ADDED Viewed

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureBindRoles = void 0;
+const utils_1 = require("../../utils");
+/**
+ * auth 为真时确保 bindRoles 包含 DEV-AdminRole 兜底角色，并校验角色合法性
+ */
+function ensureBindRoles(target, options, node) {
+    if (target.auth) {
+        if (!target.bindRoles?.length) {
+            target.bindRoles = ['DEV-AdminRole'];
+        }
+        else if (!target.bindRoles.includes('DEV-AdminRole')) {
+            target.bindRoles.unshift('DEV-AdminRole');
+        }
+    }
+    if (target.bindRoles?.length && options.appRoles?.length) {
+        const invalid = target.bindRoles.filter((r) => !options.appRoles.includes(r));
+        if (invalid.length) {
+            return (0, utils_1.throwError)(options, `bindRoles 中包含未定义的角色：${invalid.join('、')}，请先在应用的角色管理中添加对应角色`, node);
+        }
+    }
+}
+exports.ensureBindRoles = ensureBindRoles;
+//# sourceMappingURL=ensureBindRoles.js.map

package/out/natural/transforms/utils/ensureBindRoles.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"ensureBindRoles.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/ensureBindRoles.ts"],"names":[],"mappings":";;;AAAA,uCAA+E;AAE/E;;GAEG;AACH,SAAgB,eAAe,CAC7B,MAAgD,EAChD,OAA4B,EAC5B,IAAsB;IAEtB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YAC9B,MAAM,CAAC,SAAS,GAAG,CAAC,eAAe,CAAC,CAAC;QACvC,CAAC;aAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACvD,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,EAAE,MAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/E,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,IAAA,kBAAU,EACf,OAAO,EACP,uBAAuB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAC5D,IAAI,CACL,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAtBD,0CAsBC"}

package/out/natural/transforms/utils/flattenStatementsWithComments.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+/**
+ * 将 statements 中的注释（leadingComments / trailingComments）展平为独立节点，
+ * 并跳过仅作注释载体的 EmptyStatement 本体，防止 transform2Comment 重复创建 Comment 节点。
+ *
+ * @param nodeBeforeTrailing 为 true 时先推入 node 再推 trailingComments（transform2Logic 场景），
+ *                           默认 false 时先推 trailingComments 再推 node（transform2LogicItem 场景）。
+ */
+export declare function flattenStatementsWithComments(statements: any[], options?: {
+    nodeBeforeTrailing?: boolean;
+}): any[];
+//# sourceMappingURL=flattenStatementsWithComments.d.ts.map

package/out/natural/transforms/utils/flattenStatementsWithComments.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"flattenStatementsWithComments.d.ts","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/flattenStatementsWithComments.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,GAAG,EAAE,EACjB,OAAO,CAAC,EAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,GACzC,GAAG,EAAE,CAmBP"}

package/out/natural/transforms/utils/flattenStatementsWithComments.js ADDED Viewed

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.flattenStatementsWithComments = void 0;
+/**
+ * 将 statements 中的注释（leadingComments / trailingComments）展平为独立节点，
+ * 并跳过仅作注释载体的 EmptyStatement 本体，防止 transform2Comment 重复创建 Comment 节点。
+ *
+ * @param nodeBeforeTrailing 为 true 时先推入 node 再推 trailingComments（transform2Logic 场景），
+ *                           默认 false 时先推 trailingComments 再推 node（transform2LogicItem 场景）。
+ */
+function flattenStatementsWithComments(statements, options) {
+    const nodeBeforeTrailing = options?.nodeBeforeTrailing ?? false;
+    const result = [];
+    statements.forEach((node, index) => {
+        if (node?.leadingComments?.length) {
+            result.push(...node.leadingComments);
+            if (node.type === 'EmptyStatement')
+                return;
+        }
+        const isLast = index === statements.length - 1;
+        const hasTrailing = node?.trailingComments?.length && isLast;
+        if (nodeBeforeTrailing) {
+            result.push(node);
+            if (hasTrailing)
+                result.push(...node.trailingComments);
+        }
+        else {
+            if (hasTrailing)
+                result.push(...node.trailingComments);
+            result.push(node);
+        }
+    });
+    return result;
+}
+exports.flattenStatementsWithComments = flattenStatementsWithComments;
+//# sourceMappingURL=flattenStatementsWithComments.js.map

package/out/natural/transforms/utils/flattenStatementsWithComments.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"flattenStatementsWithComments.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/flattenStatementsWithComments.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,SAAgB,6BAA6B,CAC3C,UAAiB,EACjB,OAA0C;IAE1C,MAAM,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,KAAK,CAAC;IAChE,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YACrC,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB;gBAAE,OAAO;QAC7C,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAI,EAAE,gBAAgB,EAAE,MAAM,IAAI,MAAM,CAAC;QAC7D,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,WAAW;gBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,IAAI,WAAW;gBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAtBD,sEAsBC"}

package/out/natural/transforms/utils/parseDecorator.d.ts CHANGED Viewed

@@ -17,7 +17,7 @@ export interface DecoratorHandler<K extends string = never> {
 /**
  * Entity 装饰器处理器配置
  */
-export declare const ENTITY_DECORATOR: DecoratorHandler<'title' | 'uuid' | 'tableName' | 'origin' | 'directory'>;
+export declare const ENTITY_DECORATOR: DecoratorHandler<'title' | 'description' | 'uuid' | 'tableName' | 'origin' | 'directory'>;
 /**
  * EntityProperty 装饰器处理器配置
  */
@@ -33,15 +33,15 @@ export declare const ENUM_DECORATOR: DecoratorHandler<'title' | 'description' |
 /**
  * Structure 装饰器处理器配置
  */
-export declare const STRUCTURE_DECORATOR: DecoratorHandler<'title' | 'directory'>;
+export declare const STRUCTURE_DECORATOR: DecoratorHandler<'title' | 'description' | 'directory'>;
 /**
  * Logic 装饰器处理器配置（服务端全局逻辑）
  */
-export declare const LOGIC_DECORATOR: DecoratorHandler<'description' | 'transactional' | 'directory'>;
+export declare const LOGIC_DECORATOR: DecoratorHandler<'title' | 'description' | 'transactional' | 'directory' | 'returnDescription'>;
 /**
  * Logic 装饰器处理器配置（View 中的前端逻辑）
  */
-export declare const VIEW_LOGIC_DECORATOR: DecoratorHandler<'description' | 'directory'>;
+export declare const VIEW_LOGIC_DECORATOR: DecoratorHandler<'title' | 'description' | 'directory' | 'returnDescription'>;
 /**
  * Variable 装饰器处理器配置（普通变量）
  */

package/out/natural/transforms/utils/parseDecorator.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"parseDecorator.d.ts","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,SAAS,EAAc,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;~~AAIpG~~;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,EAAE,mBAAmB,~~uBA0CtK~~;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAErB,QAAQ,CAAC,EAAE;SAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM;KAAE,CAAC;IAEnC,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAC1H;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,~~CAMtG~~,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,UAAU,GAAG,YAAY,GAAG,QAAQ,GAAG,OAAO,GAAG,gBAAgB,GAAG,UAAU,CAkBxL,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,~~gBA0BvC~~,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,WAAW,CAMlF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,gBAAgB,CAAC,OAAO,GAAG,WAAW,~~CAMvE~~,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,aAAa,GAAG,eAAe,GAAG,WAAW,~~CAG3F~~,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,aAAa,GAAG,WAAW,~~CAG9E~~,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,CAAC,aAAa,GAAG,eAAe,CAGhF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,EAAE,gBAAgB,CAAC,aAAa,CAGtE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,EAAE,gBAAgB,CAAC,aAAa,GAAG,cAAc,CAMxF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,gBAAgB,CAAC,aAAa,GAAG,WAAW,GAAG,eAAe,CAGnG,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,UAAU,CAM/F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAAgB,CAAC,aAAa,GAAG,eAAe,CAG9E,CAAC;AAEF;;;GAGG;AACH,wBAAgB,yBAAyB,CACrC,UAAU,EAAE,UAAU,CAAC,SAAS,EAAE,GAAG,SAAS,EAC9C,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,EACpC,MAAM,EAAE,SAAS,CAAC,QAAQ,EAC1B,UAAU,EAAE,mBAAmB,GAChC,IAAI,~~CAmCN~~"}
1	+ {"version":3,"file":"parseDecorator.d.ts","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,SAAS,EAAc,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAKpG;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,EAAE,mBAAmB,uBAyCtK;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK;IACtD,IAAI,EAAE,MAAM,CAAC;IAEb,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAErB,QAAQ,CAAC,EAAE;SAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM;KAAE,CAAC;IAEnC,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAC1H;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,CAGtH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,UAAU,GAAG,YAAY,GAAG,QAAQ,GAAG,OAAO,GAAG,gBAAgB,GAAG,UAAU,CAkBxL,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,gBA2BvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,WAAW,CAMlF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,WAAW,CAGvF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,eAAe,GAAG,WAAW,GAAG,mBAAmB,CAG3H,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,WAAW,GAAG,mBAAmB,CAG9G,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,CAAC,aAAa,GAAG,eAAe,CAGhF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,EAAE,gBAAgB,CAAC,aAAa,CAGtE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,EAAE,gBAAgB,CAAC,aAAa,GAAG,cAAc,CAMxF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,gBAAgB,CAAC,aAAa,GAAG,WAAW,GAAG,eAAe,CAGnG,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,gBAAgB,CAAC,OAAO,GAAG,aAAa,GAAG,UAAU,CAM/F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAAgB,CAAC,aAAa,GAAG,eAAe,CAG9E,CAAC;AAEF;;;GAGG;AACH,wBAAgB,yBAAyB,CACrC,UAAU,EAAE,UAAU,CAAC,SAAS,EAAE,GAAG,SAAS,EAC9C,QAAQ,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,EACpC,MAAM,EAAE,SAAS,CAAC,QAAQ,EAC1B,UAAU,EAAE,mBAAmB,GAChC,IAAI,CA6CN"}

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

@@ -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,20 +37,15 @@ 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 {
-                    return (0, utils_1.throwError)(parseState, '不支持的 dbType 类型：' + (0, utils_1.generate)(item).code);
-                }
-            }
-            else if (item.key.name === 'rules') {
-                if (item.value.type === 'ArrayExpression') {
+            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, '不支持的 rules 类型，应为调用表达式数组（如 [min(0), max(100)]）：' + (0, utils_1.generate)(item).code);
+                    return (0, utils_1.throwError)(parseState, '不支持的数组元素类型，目前只支持字符串数组：' + (0, utils_1.generate)(item).code);
                 }
             }
             else {
@@ -66,10 +66,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 +104,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 +130,7 @@ exports.ENUM_DECORATOR = {
     name: 'Enum',
     allowedKeys: new Set(['title', 'description', 'directory']),
     mappings: {
-        title: 'description',
+        title: 'label',
     },
 };
 /**
@@ -140,24 +138,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 +210,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 +241,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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"parseDecorator.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseDecorator.ts"],"names":[],"mappings":";;;AAAA,uCAAoG;AACpG,0DAAkG;AAClG,+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,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;~~gBACtC~~,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,~~GAAG~~,CAAC,IAAI,KAAK,~~QAAQ~~,EAAE,CAAC;~~gBACtC~~,IAAI,IAAI,CAAC,~~KAAK~~,CAAC,IAAI,KAAK,~~YAAY~~,~~IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,~~EAAE,CAAC;~~oBAC7E~~,KAAK,GAAG,IAAA,~~mDAAgC~~,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;~~gBACnE~~,CAAC;qBAAM,~~CAAC;oBACN~~,~~OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,iBAAiB,GAAG,IAAA,gBAAQ,EAAC,~~IAAI,CAAC,CAAC,~~IAAI~~,CAAC,~~CAAC;gBACzE~~,CAAC~~;YACH~~,CAAC~~;iBAAM~~,~~IAAI~~,~~IAAI,~~CAAC,~~GAAG~~,~~CAAC~~,IAAI,KAAK,~~OAAO~~,EAAE,CAAC;~~gBACrC~~,~~IAAI~~,IAAI,CAAC,KAAK,CAAC,~~IAAI~~,~~KAAK~~,~~iBAAiB~~,EAAE,CAAC~~;oBAC1C~~,~~KAAK~~,~~GAAG~~,~~IAAA~~,~~4CAAyB,EAAC,IAAI,~~CAAC,KAAK,~~EAAE,UAAU,~~CAAC,CAAC;~~gBAC5D~~,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,~~gDAAgD~~,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;~~gBACxG~~,CAAC;YACH,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;~~AA1CD~~,~~kDA0CC~~;AAeD;;GAEG;AACU,QAAA,gBAAgB,~~GAA8E~~;~~IACvG~~,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;~~IAC3E~~,~~QAAQ,EAAE;QACN,KAAK,EAAE,aAAa;KACvB;CACJ,~~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,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,~~aAAa~~;~~KACvB~~;CACJ,CAAC;AAEF;;GAEG;AACU,QAAA,mBAAmB,~~GAA4C~~;~~IACxE~~,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;~~IAC5C~~,~~QAAQ,EAAE;QACN,KAAK,EAAE,aAAa;KACvB;CACJ,~~CAAC;AAEF;;GAEG;AACU,QAAA,eAAe,~~GAAoE~~;~~IAC5F~~,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;~~CACtE~~,CAAC;AAEF;;GAEG;AACU,QAAA,oBAAoB,~~GAAkD~~;IAC/E,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;~~CACrD~~,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,~~QAAQ~~,~~CAAC~~,~~OAAO~~,CAAC,CAAC,OAAO,~~EAAE~~,~~EAAE~~;~~YACzB~~,~~MAAM~~,~~mBAAmB~~,~~GAAG~~,~~SAAS~~,CAAC,~~UAAU~~,~~CAAC~~;~~YAEjD~~,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,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;~~YACD~~,~~0BAA0B~~;~~QAC9B~~,CAAC,CAAC,CAAC;~~IACP~~,CAAC,CAAC,CAAC;AACP,CAAC;~~AAxCD~~,~~8DAwCC~~"}
1	+ {"version":3,"file":"parseDecorator.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseDecorator.ts"],"names":[],"mappings":"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"}

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

@@ -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;