@lcap/nasl 4.4.0-beta.31 → 4.4.0-beta.32
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.
- package/out/natural/exports/nasl2Files.d.ts.map +1 -1
- package/out/natural/exports/nasl2Files.js +9 -0
- package/out/natural/exports/nasl2Files.js.map +1 -1
- package/out/natural/exports/transform2BatchActions/apply.d.ts +11 -0
- package/out/natural/exports/transform2BatchActions/apply.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/apply.js +68 -0
- package/out/natural/exports/transform2BatchActions/apply.js.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/directories.d.ts +17 -0
- package/out/natural/exports/transform2BatchActions/diff/directories.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/directories.js +215 -0
- package/out/natural/exports/transform2BatchActions/diff/directories.js.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/index.d.ts +21 -0
- package/out/natural/exports/transform2BatchActions/diff/index.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/index.js +20 -0
- package/out/natural/exports/transform2BatchActions/diff/index.js.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/nodes.d.ts +139 -0
- package/out/natural/exports/transform2BatchActions/diff/nodes.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/nodes.js +377 -0
- package/out/natural/exports/transform2BatchActions/diff/nodes.js.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/roles.d.ts +18 -0
- package/out/natural/exports/transform2BatchActions/diff/roles.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/diff/roles.js +52 -0
- package/out/natural/exports/transform2BatchActions/diff/roles.js.map +1 -0
- package/out/natural/exports/transform2BatchActions/index.d.ts +40 -0
- package/out/natural/exports/transform2BatchActions/index.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/index.js +59 -0
- package/out/natural/exports/transform2BatchActions/index.js.map +1 -0
- package/out/natural/exports/transform2BatchActions/parse.d.ts +14 -0
- package/out/natural/exports/transform2BatchActions/parse.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/parse.js +215 -0
- package/out/natural/exports/transform2BatchActions/parse.js.map +1 -0
- package/out/natural/exports/transform2BatchActions/types.d.ts +134 -0
- package/out/natural/exports/transform2BatchActions/types.d.ts.map +1 -0
- package/out/natural/exports/transform2BatchActions/types.js +7 -0
- package/out/natural/exports/transform2BatchActions/types.js.map +1 -0
- package/out/natural/parser/parseNaturalTS.d.ts.map +1 -1
- package/out/natural/parser/parseNaturalTS.js +15 -1
- package/out/natural/parser/parseNaturalTS.js.map +1 -1
- package/out/natural/parser/parseNaturalTSXView.d.ts.map +1 -1
- package/out/natural/parser/parseNaturalTSXView.js +51 -2
- package/out/natural/parser/parseNaturalTSXView.js.map +1 -1
- package/out/natural/transforms/transform2GlobalLogicDeclaration.d.ts.map +1 -1
- package/out/natural/transforms/transform2GlobalLogicDeclaration.js +3 -0
- package/out/natural/transforms/transform2GlobalLogicDeclaration.js.map +1 -1
- package/out/natural/transforms/transform2Logic.d.ts.map +1 -1
- package/out/natural/transforms/transform2Logic.js +3 -0
- package/out/natural/transforms/transform2Logic.js.map +1 -1
- package/out/natural/transforms/transform2LogicItem.d.ts.map +1 -1
- package/out/natural/transforms/transform2LogicItem.js +16 -10
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/natural/transforms/transform2Param.d.ts.map +1 -1
- package/out/natural/transforms/transform2Param.js +7 -0
- package/out/natural/transforms/transform2Param.js.map +1 -1
- package/out/natural/transforms/transform2Roles.d.ts +3 -0
- package/out/natural/transforms/transform2Roles.d.ts.map +1 -0
- package/out/natural/transforms/transform2Roles.js +30 -0
- package/out/natural/transforms/transform2Roles.js.map +1 -0
- package/out/natural/transforms/transform2TypeAnnotation.d.ts.map +1 -1
- package/out/natural/transforms/transform2TypeAnnotation.js +8 -4
- package/out/natural/transforms/transform2TypeAnnotation.js.map +1 -1
- package/out/natural/transforms/utils/parseDecorator.d.ts +2 -2
- package/out/natural/transforms/utils/parseDecorator.d.ts.map +1 -1
- package/out/natural/transforms/utils/parseDecorator.js +8 -5
- package/out/natural/transforms/utils/parseDecorator.js.map +1 -1
- package/out/natural/utils/index.d.ts +3 -0
- package/out/natural/utils/index.d.ts.map +1 -1
- package/out/natural/utils/index.js +11 -1
- package/out/natural/utils/index.js.map +1 -1
- package/package.json +10 -9
- package/out/natural/exports/transform2BatchActions.d.ts +0 -114
- package/out/natural/exports/transform2BatchActions.d.ts.map +0 -1
- package/out/natural/exports/transform2BatchActions.js +0 -1233
- package/out/natural/exports/transform2BatchActions.js.map +0 -1
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.transform2Roles = void 0;
|
|
4
|
+
const utils_1 = require("../utils");
|
|
5
|
+
function transform2Roles(arg, app, parseState) {
|
|
6
|
+
arg.elements.forEach((el) => {
|
|
7
|
+
if (el?.type !== 'ObjectExpression')
|
|
8
|
+
return;
|
|
9
|
+
const findProp = (key) => el.properties.find((p) => p.type === 'ObjectProperty' && ((p.key.type === 'Identifier' && p.key.name === key) ||
|
|
10
|
+
(p.key.type === 'StringLiteral' && p.key.value === key)));
|
|
11
|
+
const nameProp = findProp('name');
|
|
12
|
+
const descProp = findProp('description');
|
|
13
|
+
const uuidProp = findProp('uuid');
|
|
14
|
+
const name = nameProp?.value.type === 'StringLiteral'
|
|
15
|
+
? nameProp.value.value
|
|
16
|
+
: undefined;
|
|
17
|
+
if (!name) {
|
|
18
|
+
return (0, utils_1.throwError)(parseState, '角色对象缺少有效的 name 字段（应为字符串）', el);
|
|
19
|
+
}
|
|
20
|
+
const description = descProp?.value.type === 'StringLiteral'
|
|
21
|
+
? descProp.value.value
|
|
22
|
+
: '';
|
|
23
|
+
const uuid = uuidProp?.value.type === 'StringLiteral'
|
|
24
|
+
? uuidProp.value.value
|
|
25
|
+
: undefined;
|
|
26
|
+
app.roles.push(new utils_1.naslTypes.Role({ name, description, ...(uuid ? { uuid } : {}) }));
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
exports.transform2Roles = transform2Roles;
|
|
30
|
+
//# sourceMappingURL=transform2Roles.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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,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,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,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,0CA0BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2TypeAnnotation.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,
|
|
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"}
|
|
@@ -96,10 +96,14 @@ function transform2TypeAnnotation(node, parseState) {
|
|
|
96
96
|
return (0, utils_1.throwError)(parseState, `Unhandled node ${node.type}`);
|
|
97
97
|
}
|
|
98
98
|
else if (node.type === 'TSTypeLiteral') {
|
|
99
|
-
return utils_1.naslTypes.TypeAnnotation.createTypeAnonymousStructure(node.members.map((member) =>
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
99
|
+
return utils_1.naslTypes.TypeAnnotation.createTypeAnonymousStructure(node.members.map((member) => {
|
|
100
|
+
const description = (0, utils_1.fetchDescriptionFromComments)(member.leadingComments);
|
|
101
|
+
return new utils_1.naslTypes.StructureProperty({
|
|
102
|
+
name: member.key.name,
|
|
103
|
+
description: description || undefined,
|
|
104
|
+
typeAnnotation: transform2TypeAnnotation(member.typeAnnotation.typeAnnotation, parseState) || undefined,
|
|
105
|
+
});
|
|
106
|
+
}));
|
|
103
107
|
}
|
|
104
108
|
else if (node.type === 'TSBooleanKeyword') {
|
|
105
109
|
return utils_1.naslTypes.TypeAnnotation.createPrimitive('Boolean');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2TypeAnnotation.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"transform2TypeAnnotation.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,11 +37,11 @@ export declare const STRUCTURE_DECORATOR: DecoratorHandler<'title' | 'directory'
|
|
|
37
37
|
/**
|
|
38
38
|
* Logic 装饰器处理器配置（服务端全局逻辑）
|
|
39
39
|
*/
|
|
40
|
-
export declare const LOGIC_DECORATOR: DecoratorHandler<'description' | 'transactional' | 'directory'>;
|
|
40
|
+
export declare const LOGIC_DECORATOR: DecoratorHandler<'description' | 'transactional' | 'directory' | 'returnDescription'>;
|
|
41
41
|
/**
|
|
42
42
|
* Logic 装饰器处理器配置（View 中的前端逻辑）
|
|
43
43
|
*/
|
|
44
|
-
export declare const VIEW_LOGIC_DECORATOR: DecoratorHandler<'description' | 'directory'>;
|
|
44
|
+
export declare const VIEW_LOGIC_DECORATOR: DecoratorHandler<'description' | 'directory' | 'returnDescription'>;
|
|
45
45
|
/**
|
|
46
46
|
* Variable 装饰器处理器配置（普通变量）
|
|
47
47
|
*/
|
|
@@ -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,
|
|
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,uBA4CtK;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,GAAG,mBAAmB,CAGjH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,aAAa,GAAG,WAAW,GAAG,mBAAmB,CAGpG,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"}
|
|
@@ -40,12 +40,15 @@ function pickDecoratorObject(objectExpression, keys, mappings, parseState) {
|
|
|
40
40
|
return (0, utils_1.throwError)(parseState, '不支持的 dbType 类型：' + (0, utils_1.generate)(item).code);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
else if (item.
|
|
44
|
-
if (item.
|
|
43
|
+
else if (item.value.type === 'ArrayExpression') {
|
|
44
|
+
if (item.key.name === 'rules') {
|
|
45
45
|
value = (0, transform2Entity_1.transform2ValidationRules)(item.value, parseState);
|
|
46
46
|
}
|
|
47
|
+
else if (item.value.elements.every(el => el?.type === 'StringLiteral')) {
|
|
48
|
+
value = item.value.elements.map(el => el.value);
|
|
49
|
+
}
|
|
47
50
|
else {
|
|
48
|
-
return (0, utils_1.throwError)(parseState, '
|
|
51
|
+
return (0, utils_1.throwError)(parseState, '不支持的数组元素类型，目前只支持字符串数组：' + (0, utils_1.generate)(item).code);
|
|
49
52
|
}
|
|
50
53
|
}
|
|
51
54
|
else {
|
|
@@ -150,14 +153,14 @@ exports.STRUCTURE_DECORATOR = {
|
|
|
150
153
|
*/
|
|
151
154
|
exports.LOGIC_DECORATOR = {
|
|
152
155
|
name: 'Logic',
|
|
153
|
-
allowedKeys: new Set(['description', 'transactional', 'directory']),
|
|
156
|
+
allowedKeys: new Set(['description', 'transactional', 'directory', 'returnDescription']),
|
|
154
157
|
};
|
|
155
158
|
/**
|
|
156
159
|
* Logic 装饰器处理器配置（View 中的前端逻辑）
|
|
157
160
|
*/
|
|
158
161
|
exports.VIEW_LOGIC_DECORATOR = {
|
|
159
162
|
name: 'Logic',
|
|
160
|
-
allowedKeys: new Set(['description', 'directory']),
|
|
163
|
+
allowedKeys: new Set(['description', 'directory', 'returnDescription']),
|
|
161
164
|
};
|
|
162
165
|
/**
|
|
163
166
|
* Variable 装饰器处理器配置（普通变量）
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"parseDecorator.js","sourceRoot":"","sources":["../../../../src/natural/transforms/utils/parseDecorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,8 @@ export interface ParseNaturalTSState {
|
|
|
26
26
|
source?: string;
|
|
27
27
|
componentsMap?: componentsMap;
|
|
28
28
|
strictForTraining?: boolean;
|
|
29
|
+
/** 当前 app 中已定义的角色名列表，用于校验 bindRoles */
|
|
30
|
+
appRoles?: string[];
|
|
29
31
|
}
|
|
30
32
|
export interface ParseLogicState extends ParseNaturalTSState {
|
|
31
33
|
isInFrontend?: boolean;
|
|
@@ -69,6 +71,7 @@ export declare function getDecoratorCall(statement: babelTypes.Statement | undef
|
|
|
69
71
|
export declare function throwWarning(message: string, babelNode?: babelTypes.Node | string, babelNode2?: babelTypes.Node | string): void;
|
|
70
72
|
export declare function tryParseTS(tsCode: string): import("@babel/parser").ParseResult<babel.types.File>;
|
|
71
73
|
export declare function fetchFromComments(comments?: Array<babelTypes.Comment | babelTypes.CommentBlock>): string;
|
|
74
|
+
export declare function fetchDescriptionFromComments(comments?: Array<babelTypes.Comment | babelTypes.CommentBlock>): string;
|
|
72
75
|
export declare const genAIUID: (node: any, sessionId: string, num?: number) => {
|
|
73
76
|
node: any;
|
|
74
77
|
number: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/natural/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAI5C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAG3C,OAAO,EACL,OAAO,EACP,MAAM,EACN,cAAc,EACd,cAAc,EACd,SAAS,EACT,WAAW,EACX,WAAW,EACZ,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AAGxF,wBAAgB,KAAK,YAEpB;AAED,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM,CAAC;AAExE,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;CAI5B;AAGD,MAAM,MAAM,aAAa,GAAG,GAAG,CAC7B,MAAM,EACN;IACE,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,CACF,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,IAAI,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/natural/utils/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
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;
|
|
29
|
+
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;
|
|
30
30
|
const babel = __importStar(require("@babel/core"));
|
|
31
31
|
const babelTypes = __importStar(require("@babel/types"));
|
|
32
32
|
exports.babelTypes = babelTypes;
|
|
@@ -184,6 +184,16 @@ function fetchFromComments(comments) {
|
|
|
184
184
|
return processedLines.join(' ').replace(/\s+/g, ' ').trim();
|
|
185
185
|
}
|
|
186
186
|
exports.fetchFromComments = fetchFromComments;
|
|
187
|
+
// 从注释中提取 description，兼容 4 种格式：
|
|
188
|
+
// /** @description xxx */ /* @description xxx */ /** xxx */ /* xxx */
|
|
189
|
+
function fetchDescriptionFromComments(comments) {
|
|
190
|
+
const raw = fetchFromComments(comments);
|
|
191
|
+
if (!raw)
|
|
192
|
+
return undefined;
|
|
193
|
+
const match = raw.match(/^@description\s+([\s\S]*)/);
|
|
194
|
+
return match ? match[1].trim() : raw;
|
|
195
|
+
}
|
|
196
|
+
exports.fetchDescriptionFromComments = fetchDescriptionFromComments;
|
|
187
197
|
// 根据 sessionId 生成 _aiUID
|
|
188
198
|
const genAIUID = (node, sessionId, num) => {
|
|
189
199
|
let temp = node.elements;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/natural/utils/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lcap/nasl",
|
|
3
3
|
"description": "NetEase Application Specific Language",
|
|
4
|
-
"version": "4.4.0-beta.
|
|
4
|
+
"version": "4.4.0-beta.32",
|
|
5
5
|
"author": "Forrest <rainforest92@126.com>",
|
|
6
6
|
"main": "./out",
|
|
7
7
|
"types": "./out/index.d.ts",
|
|
@@ -79,14 +79,14 @@
|
|
|
79
79
|
"vue": "3.4.33",
|
|
80
80
|
"vue-template-compiler": "2.6.14",
|
|
81
81
|
"vue-template-es2015-compiler": "1.9.1",
|
|
82
|
-
"@lcap/nasl-breakpoint": "4.4.0-beta.
|
|
83
|
-
"@lcap/nasl-
|
|
84
|
-
"@lcap/nasl-
|
|
85
|
-
"@lcap/nasl-log": "4.4.0-beta.
|
|
86
|
-
"@lcap/nasl-translator": "4.4.0-beta.
|
|
87
|
-
"@lcap/nasl-types": "4.4.0-beta.
|
|
88
|
-
"@lcap/nasl-unified-frontend-generator": "4.4.0-beta.
|
|
89
|
-
"@lcap/nasl-utils": "4.4.0-beta.
|
|
82
|
+
"@lcap/nasl-breakpoint": "4.4.0-beta.32",
|
|
83
|
+
"@lcap/nasl-concepts": "4.4.0-beta.32",
|
|
84
|
+
"@lcap/nasl-language-server-core": "4.4.0-beta.32",
|
|
85
|
+
"@lcap/nasl-log": "4.4.0-beta.32",
|
|
86
|
+
"@lcap/nasl-translator": "4.4.0-beta.32",
|
|
87
|
+
"@lcap/nasl-types": "4.4.0-beta.32",
|
|
88
|
+
"@lcap/nasl-unified-frontend-generator": "4.4.0-beta.32",
|
|
89
|
+
"@lcap/nasl-utils": "4.4.0-beta.32"
|
|
90
90
|
},
|
|
91
91
|
"devDependencies": {
|
|
92
92
|
"@babel/preset-react": "7.24.1",
|
|
@@ -113,6 +113,7 @@
|
|
|
113
113
|
"test:ci": "pnpm test:gen && pnpm run --filter @lcap/nasl-test-toolkit runtest:ci --require $PWD/tests/setup.ts --config $PWD/.mocharc.js --j 3",
|
|
114
114
|
"test:qa": "pnpm test:gen && pnpm run --filter @lcap/nasl-test-toolkit runtest:ci --require $PWD/tests/setup.ts --config $PWD/.mocharc.js --j 1",
|
|
115
115
|
"test:tdd": "node_modules/@lcap/nasl-test-toolkit/node_modules/mocha/bin/mocha.js --no-config --file $PWD/tests/tdd/tdd.spec.js",
|
|
116
|
+
"test:batch": "node_modules/@lcap/nasl-test-toolkit/node_modules/mocha/bin/mocha.js --no-config --file $PWD/tests/tdd/batchActions.spec.js",
|
|
116
117
|
"test:tdd:one": "node --inspect node_modules/@lcap/nasl-test-toolkit/node_modules/mocha/bin/mocha.js --no-config --file $PWD/tests/tdd/tdd.one.spec.js",
|
|
117
118
|
"test:update": "npm run test -- --update",
|
|
118
119
|
"release:alpha": "npm run build && pnpm publish --tag alpha --access public --no-git-checks",
|
|
@@ -1,114 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
*
|
|
3
|
-
* 这个模块的主要功能是将多个代码文件操作（创建、更新、删除）转换为统一的nasl批量操作格式，
|
|
4
|
-
*
|
|
5
|
-
* 主要处理流程：
|
|
6
|
-
* 1. 解析codeAction 的路径，提取命名空间和项目类型信息
|
|
7
|
-
* 2. 将代码内容包装在适当的命名空间中
|
|
8
|
-
* 3. 使用 parseNaturalTS 解析 TypeScript 代码为 NASL 对象
|
|
9
|
-
* 4. 为每种类型（entity、structure、enum、logic、view）提供统一的操作接口
|
|
10
|
-
* 5. 生成批量操作数组，支持创建、更新和删除操作
|
|
11
|
-
* 6. 处理操作过程中的错误并提供调试信息
|
|
12
|
-
*
|
|
13
|
-
* 目前支持的类型：
|
|
14
|
-
* - entity: 数据实体
|
|
15
|
-
* - structure: 数据结构
|
|
16
|
-
* - enum: 枚举类型
|
|
17
|
-
* - logic: 业务逻辑
|
|
18
|
-
* - view: 视图组件
|
|
19
|
-
* - backendVariables: 后端变量
|
|
20
|
-
* - frontendVariables: 前端类型变量
|
|
21
|
-
*/
|
|
22
|
-
/**
|
|
23
|
-
* 用于描述对代码文件的操作，包括路径、内容和操作类型
|
|
24
|
-
*/
|
|
25
|
-
export interface CodeAction {
|
|
26
|
-
/** 文件路径，例如: 'src/app.enums.SomeType.ts' */
|
|
27
|
-
path: string;
|
|
28
|
-
/** 文件内容 */
|
|
29
|
-
content: string;
|
|
30
|
-
/** 操作类型：创建、更新、删除或已存在（用于自动生成的父级视图） */
|
|
31
|
-
action: 'create' | 'update' | 'delete' | 'exist';
|
|
32
|
-
}
|
|
33
|
-
/**
|
|
34
|
-
* 批量操作接口
|
|
35
|
-
* 用于描述单个批量操作的详细信息
|
|
36
|
-
*/
|
|
37
|
-
interface BatchAction {
|
|
38
|
-
/** 操作类型 */
|
|
39
|
-
action: string;
|
|
40
|
-
/** 操作路径 */
|
|
41
|
-
path: string;
|
|
42
|
-
/** NASL 对象 */
|
|
43
|
-
object: any;
|
|
44
|
-
}
|
|
45
|
-
/**
|
|
46
|
-
* 用于描述一组批量操作及其元信息
|
|
47
|
-
*/
|
|
48
|
-
export interface Operators {
|
|
49
|
-
/** 唯一标识符 */
|
|
50
|
-
uuid: string;
|
|
51
|
-
/** 批量操作数组 */
|
|
52
|
-
actions: BatchAction[];
|
|
53
|
-
/** 操作描述信息 */
|
|
54
|
-
actionMsg: string;
|
|
55
|
-
/** 源类型 */
|
|
56
|
-
sourceType: string;
|
|
57
|
-
}
|
|
58
|
-
/**
|
|
59
|
-
* 布局模板参数接口
|
|
60
|
-
*/
|
|
61
|
-
interface LayoutTemplateParams {
|
|
62
|
-
viewName: string;
|
|
63
|
-
title: string;
|
|
64
|
-
namespace: string;
|
|
65
|
-
}
|
|
66
|
-
/**
|
|
67
|
-
* 生成空的路由容器模板
|
|
68
|
-
* 用于为嵌套视图创建父级容器视图
|
|
69
|
-
* @param params - 包含视图名称、标题和命名空间的参数
|
|
70
|
-
* @returns 生成的路由容器模板代码
|
|
71
|
-
*/
|
|
72
|
-
export declare const generateRouterContainerTemplate: (params: Pick<LayoutTemplateParams, 'viewName' | 'title' | 'namespace'>) => string;
|
|
73
|
-
/**
|
|
74
|
-
* 将 codeAction 数组转换为批量操作
|
|
75
|
-
* 这是整个模块的核心函数，负责将多个codeAction 转换成统一的批量操作格式
|
|
76
|
-
*
|
|
77
|
-
* 处理流程：
|
|
78
|
-
* 1. 解析每个 codeAction ，提取类型和名称信息
|
|
79
|
-
* 2. 将需要解析的代码合并并通过 parseNaturalTS 解析
|
|
80
|
-
* 3. 为每个操作生成对应的 NASL 对象
|
|
81
|
-
* 4. 构建批量操作数组，支持创建、更新和删除操作
|
|
82
|
-
* 5. 处理错误并返回结果
|
|
83
|
-
*
|
|
84
|
-
* @param codeActions - codeAction 数组，每个元素包含 path、content、action
|
|
85
|
-
* @param app - NASL 应用实例，用于操作目标应用
|
|
86
|
-
* @param sessionId - 会话 ID，用于生成唯一标识
|
|
87
|
-
* @param type - 操作类型，'normal' 为正常模式，'debug' 为调试模式（会返回更多信息）
|
|
88
|
-
* @param files - 可选的完整文件列表，包含现有文件和新文件
|
|
89
|
-
* @returns 包含批量操作和可选调试信息的对象
|
|
90
|
-
*/
|
|
91
|
-
export declare const transform2BatchActions: ({ codeActions, app, sessionId, type, }: {
|
|
92
|
-
codeActions: CodeAction[];
|
|
93
|
-
app: any;
|
|
94
|
-
sessionId: string;
|
|
95
|
-
type?: 'normal' | 'debug';
|
|
96
|
-
}) => {
|
|
97
|
-
batchActions: Operators;
|
|
98
|
-
accumulatedTsCode?: string;
|
|
99
|
-
parseJSON?: any;
|
|
100
|
-
errors?: Array<{
|
|
101
|
-
item: string;
|
|
102
|
-
type: string;
|
|
103
|
-
error: Error;
|
|
104
|
-
}>;
|
|
105
|
-
};
|
|
106
|
-
/**
|
|
107
|
-
* 将批量操作应用到 app 实例
|
|
108
|
-
* 处理批量操作（create/update/delete），并将其应用到 app 中
|
|
109
|
-
* @param app - NASL 应用实例，需传入 Vue 劫持后的响应式 app
|
|
110
|
-
* @param batchActions - 需要应用的批量操作
|
|
111
|
-
*/
|
|
112
|
-
export declare const applyBatchActions: (app: any, batchActions: Operators) => void;
|
|
113
|
-
export {};
|
|
114
|
-
//# sourceMappingURL=transform2BatchActions.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transform2BatchActions.d.ts","sourceRoot":"","sources":["../../../src/natural/exports/transform2BatchActions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAQH;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;CAClD;AAED;;;GAGG;AACH,UAAU,WAAW;IACnB,WAAW;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,cAAc;IACd,MAAM,EAAE,GAAG,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,YAAY;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,aAAa;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,aAAa;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU;IACV,UAAU,EAAE,MAAM,CAAC;CACpB;AAwBD;;GAEG;AACH,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,WAClC,KAAK,oBAAoB,EAAE,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC,KACrE,MAeF,CAAC;AA6xBF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,sBAAsB,2CAKhC;IACD,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC3B,KAAG;IACF,YAAY,EAAE,SAAS,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;CAmN9D,CAAC;AA6ZF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,QAAS,GAAG,gBAAgB,SAAS,SA2DlE,CAAC"}
|