@lcap/nasl 4.1.0-creator.1 → 4.1.0-creator.10
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/index.d.ts +1 -0
- package/out/natural/index.d.ts.map +1 -1
- package/out/natural/index.js +3 -0
- package/out/natural/index.js.map +1 -1
- package/out/natural/parseNaturalTS.d.ts +4 -7
- package/out/natural/parseNaturalTS.d.ts.map +1 -1
- package/out/natural/parseNaturalTS.js +84 -69
- package/out/natural/parseNaturalTS.js.map +1 -1
- package/out/natural/parseNaturalTSXView.d.ts +16 -4
- package/out/natural/parseNaturalTSXView.d.ts.map +1 -1
- package/out/natural/parseNaturalTSXView.js +196 -91
- package/out/natural/parseNaturalTSXView.js.map +1 -1
- package/out/natural/transformTS2UI.d.ts.map +1 -1
- package/out/natural/transformTS2UI.js +9 -8
- package/out/natural/transformTS2UI.js.map +1 -1
- package/out/natural/transformTSCode.js +3 -3
- package/out/natural/transformTSCode.js.map +1 -1
- package/out/natural/transforms/transform2Entity.d.ts +3 -1
- package/out/natural/transforms/transform2Entity.d.ts.map +1 -1
- package/out/natural/transforms/transform2Entity.js +28 -6
- package/out/natural/transforms/transform2Entity.js.map +1 -1
- package/out/natural/transforms/transform2Enum.d.ts +3 -1
- package/out/natural/transforms/transform2Enum.d.ts.map +1 -1
- package/out/natural/transforms/transform2Enum.js +20 -4
- package/out/natural/transforms/transform2Enum.js.map +1 -1
- package/out/natural/transforms/transform2GlobalLogicDeclaration.d.ts +3 -1
- package/out/natural/transforms/transform2GlobalLogicDeclaration.d.ts.map +1 -1
- package/out/natural/transforms/transform2GlobalLogicDeclaration.js +3 -3
- package/out/natural/transforms/transform2GlobalLogicDeclaration.js.map +1 -1
- package/out/natural/transforms/transform2Logic.d.ts +9 -3
- package/out/natural/transforms/transform2Logic.d.ts.map +1 -1
- package/out/natural/transforms/transform2Logic.js +14 -8
- package/out/natural/transforms/transform2Logic.js.map +1 -1
- package/out/natural/transforms/transform2LogicItem.d.ts +30 -26
- package/out/natural/transforms/transform2LogicItem.d.ts.map +1 -1
- package/out/natural/transforms/transform2LogicItem.js +199 -132
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/natural/transforms/transform2MetadataType.d.ts +3 -1
- package/out/natural/transforms/transform2MetadataType.d.ts.map +1 -1
- package/out/natural/transforms/transform2MetadataType.js +2 -2
- package/out/natural/transforms/transform2MetadataType.js.map +1 -1
- package/out/natural/transforms/transform2Structure.d.ts +3 -1
- package/out/natural/transforms/transform2Structure.d.ts.map +1 -1
- package/out/natural/transforms/transform2Structure.js +4 -4
- package/out/natural/transforms/transform2Structure.js.map +1 -1
- package/out/natural/transforms/transform2TypeAnnotation.d.ts +3 -1
- package/out/natural/transforms/transform2TypeAnnotation.d.ts.map +1 -1
- package/out/natural/transforms/transform2TypeAnnotation.js +10 -11
- package/out/natural/transforms/transform2TypeAnnotation.js.map +1 -1
- package/out/natural/transforms/transform2ValidationRule.d.ts +3 -1
- package/out/natural/transforms/transform2ValidationRule.d.ts.map +1 -1
- package/out/natural/transforms/transform2ValidationRule.js +9 -4
- package/out/natural/transforms/transform2ValidationRule.js.map +1 -1
- package/out/natural/transforms/transform2Variable.d.ts +6 -2
- package/out/natural/transforms/transform2Variable.d.ts.map +1 -1
- package/out/natural/transforms/transform2Variable.js +10 -10
- package/out/natural/transforms/transform2Variable.js.map +1 -1
- package/out/natural/transforms/transformThemeAndStyle.d.ts +6 -2
- package/out/natural/transforms/transformThemeAndStyle.d.ts.map +1 -1
- package/out/natural/transforms/transformThemeAndStyle.js +7 -7
- package/out/natural/transforms/transformThemeAndStyle.js.map +1 -1
- package/out/natural/transforms/utils.d.ts +8 -3
- package/out/natural/transforms/utils.d.ts.map +1 -1
- package/out/natural/transforms/utils.js +20 -8
- package/out/natural/transforms/utils.js.map +1 -1
- package/out/server/findReference.d.ts.map +1 -1
- package/out/server/findReference.js +4 -0
- package/out/server/findReference.js.map +1 -1
- package/package.json +10 -10
- package/out/natural/transforms/registerTransform.d.ts +0 -8
- package/out/natural/transforms/registerTransform.d.ts.map +0 -1
- package/out/natural/transforms/registerTransform.js +0 -24
- package/out/natural/transforms/registerTransform.js.map +0 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.transform2TypeAnnotation = void 0;
|
|
4
4
|
const utils_1 = require("./utils");
|
|
5
|
-
function transform2TypeAnnotation(node) {
|
|
5
|
+
function transform2TypeAnnotation(node, options) {
|
|
6
6
|
if (!node)
|
|
7
7
|
return null;
|
|
8
8
|
if (node.type === 'TSTypeReference') {
|
|
@@ -26,8 +26,7 @@ function transform2TypeAnnotation(node) {
|
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
if (typeName === 'Any' || typeName === 'any' || typeName === '__IDENTIFIER__') {
|
|
29
|
-
(0, utils_1.throwError)(`Unsupport type ${typeName}`);
|
|
30
|
-
return undefined;
|
|
29
|
+
return (0, utils_1.throwError)(options?.parsingId, `Unsupport type ${typeName}`);
|
|
31
30
|
}
|
|
32
31
|
if (typeName === 'Integer') {
|
|
33
32
|
return utils_1.naslTypes.TypeAnnotation.createPrimitive('Long');
|
|
@@ -45,7 +44,7 @@ function transform2TypeAnnotation(node) {
|
|
|
45
44
|
if (['HttpRequest', 'HttpResponse'].includes(typeName)) {
|
|
46
45
|
return utils_1.naslTypes.TypeAnnotation.createGeneric(typeName, {
|
|
47
46
|
typeNamespace: 'nasl.http',
|
|
48
|
-
typeArguments: node?.typeParameters?.params.map(transform2TypeAnnotation),
|
|
47
|
+
typeArguments: node?.typeParameters?.params.map((type) => transform2TypeAnnotation(type, options)).filter(Boolean),
|
|
49
48
|
});
|
|
50
49
|
}
|
|
51
50
|
if (primitiveType) {
|
|
@@ -64,13 +63,13 @@ function transform2TypeAnnotation(node) {
|
|
|
64
63
|
};
|
|
65
64
|
}
|
|
66
65
|
return type;
|
|
67
|
-
}).map(transform2TypeAnnotation),
|
|
66
|
+
}).map((type) => transform2TypeAnnotation(type, options)).filter(Boolean),
|
|
68
67
|
});
|
|
69
68
|
}
|
|
70
69
|
if (node.typeName.type === 'TSQualifiedName' && node.typeParameters) {
|
|
71
70
|
const curTypeName = node?.typeName?.right?.name;
|
|
72
71
|
return utils_1.naslTypes.TypeAnnotation.createGeneric(curTypeName, {
|
|
73
|
-
typeArguments: node?.typeParameters?.params.map(transform2TypeAnnotation),
|
|
72
|
+
typeArguments: node?.typeParameters?.params.map((type) => transform2TypeAnnotation(type, options)).filter(Boolean),
|
|
74
73
|
});
|
|
75
74
|
}
|
|
76
75
|
if (!node.typeParameters) {
|
|
@@ -87,17 +86,17 @@ function transform2TypeAnnotation(node) {
|
|
|
87
86
|
if (typeName === 'T') {
|
|
88
87
|
return utils_1.naslTypes.TypeAnnotation.createTypeParam(typeName);
|
|
89
88
|
}
|
|
90
|
-
(0, utils_1.throwError)(`Unknown type reference ${typeName}`);
|
|
89
|
+
return (0, utils_1.throwError)(options?.parsingId, `Unknown type reference ${typeName}`);
|
|
91
90
|
return utils_1.naslTypes.TypeAnnotation.createReference(typeName, {
|
|
92
91
|
typeNamespace: null,
|
|
93
92
|
});
|
|
94
93
|
}
|
|
95
|
-
(0, utils_1.throwError)(`Unhandled node ${node.type}`);
|
|
94
|
+
return (0, utils_1.throwError)(options?.parsingId, `Unhandled node ${node.type}`);
|
|
96
95
|
}
|
|
97
96
|
else if (node.type === 'TSTypeLiteral') {
|
|
98
97
|
return utils_1.naslTypes.TypeAnnotation.createTypeAnonymousStructure(node.members.map((member) => new utils_1.naslTypes.StructureProperty({
|
|
99
98
|
name: member.key.name,
|
|
100
|
-
typeAnnotation: transform2TypeAnnotation(member.typeAnnotation.typeAnnotation),
|
|
99
|
+
typeAnnotation: transform2TypeAnnotation(member.typeAnnotation.typeAnnotation, options) || undefined,
|
|
101
100
|
})));
|
|
102
101
|
}
|
|
103
102
|
else if (node.type === 'TSBooleanKeyword') {
|
|
@@ -113,12 +112,12 @@ function transform2TypeAnnotation(node) {
|
|
|
113
112
|
const union = utils_1.naslTypes.TypeAnnotation.createPrimitive('Union');
|
|
114
113
|
union.typeArguments = [];
|
|
115
114
|
node.types.forEach((curType) => {
|
|
116
|
-
union.typeArguments.push(transform2TypeAnnotation(curType));
|
|
115
|
+
union.typeArguments.push(transform2TypeAnnotation(curType, options) || undefined);
|
|
117
116
|
});
|
|
118
117
|
return union;
|
|
119
118
|
}
|
|
120
119
|
else {
|
|
121
|
-
(0, utils_1.throwError)(`Unhandled node ${node.type}`);
|
|
120
|
+
return (0, utils_1.throwError)(options?.parsingId, `Unhandled node ${node.type}`);
|
|
122
121
|
}
|
|
123
122
|
}
|
|
124
123
|
exports.transform2TypeAnnotation = transform2TypeAnnotation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2TypeAnnotation.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":";;;AAAA,mCAAyF;AAEzF,SAAgB,wBAAwB,CAAC,IAAuB;
|
|
1
|
+
{"version":3,"file":"transform2TypeAnnotation.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2TypeAnnotation.ts"],"names":[],"mappings":";;;AAAA,mCAAyF;AAEzF,SAAgB,wBAAwB,CAAC,IAAuB,EAAE,OAA+B;IAC/F,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QACpC,IAAI,cAAqC,CAAC;QAC1C,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAC7C,cAAc,GAAI,IAAI,CAAC,QAAgB,CAAC,KAAK,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,IAAI,CAAC,QAAiC,CAAC;QAC1D,CAAC;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC;QACrC,MAAM,aAAa,GAAG,iBAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QACzF,IAAK,IAAY,EAAE,aAAa,EAAE,CAAC;YACjC,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,EAAE;gBACxD,aAAa,EAAG,IAAY,CAAC,aAAa;aAC3C,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3D,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,EAAE;gBACxD,aAAa,EAAE,SAAS;aACzB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;YAC9E,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,kBAAkB,QAAQ,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,EAAE;gBACvD,aAAa,EAAE,YAAY;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,EAAE;gBACxD,aAAa,EAAE,WAAW;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvD,OAAO,iBAAS,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,EAAE;gBACtD,aAAa,EAAE,WAAW;gBAC1B,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAA+B;aACjJ,CAAC,CAAC;QACL,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,cAAc,EAAE,CAAC;YAC1E,OAAO,iBAAS,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,EAAE;gBACtD,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACvD,IAAI,QAAQ,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;wBACxD,OAAO;4BACL,IAAI,EAAE,iBAAiB;4BACvB,QAAQ,EAAE;gCACR,IAAI,EAAE,YAAY;gCAClB,IAAI,EAAE,GAAG;6BACV;yBAC4B,CAAC;oBAClC,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAA+B;aACxG,CAAC,CAAC;QACL,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,iBAAiB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACpE,MAAM,WAAW,GAAI,IAAI,EAAE,QAAgB,EAAE,KAAK,EAAE,IAAI,CAAC;YACzD,OAAO,iBAAS,CAAC,cAAc,CAAC,aAAa,CAAC,WAAW,EAAE;gBACzD,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAA+B;aACjJ,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBAC/C,MAAM,WAAW,GAAG,IAAA,gBAAQ,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAW,CAAC,EAAE,IAAI,CAAC;gBAChE,kBAAkB;gBAClB,IACE,4GAA4G,CAAC,IAAI,CAC/G,WAAW,CACZ,EACD,CAAC;oBACD,MAAM,WAAW,GAAI,IAAI,EAAE,QAAgB,EAAE,KAAK,EAAE,IAAI,CAAC;oBACzD,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,EAAE;wBAC3D,aAAa,EAAE,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC;qBACjE,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;gBACrB,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,0BAA0B,QAAQ,EAAE,CAAC,CAAC;YAC5E,OAAO,iBAAS,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,EAAE;gBACxD,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QACzC,OAAO,iBAAS,CAAC,cAAc,CAAC,4BAA4B,CAC1D,IAAI,CAAC,OAAO,CAAC,GAAG,CACd,CAAC,MAAsC,EAAE,EAAE,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,OAAO,CAAC,IAAI,SAAS;SACrG,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,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAzHD,4DAyHC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { babelTypes, naslTypes } from "./utils";
|
|
2
|
-
export declare function transform2ValidationRule(node: babelTypes.CallExpression
|
|
2
|
+
export declare function transform2ValidationRule(node: babelTypes.CallExpression, options?: {
|
|
3
|
+
parsingId?: number;
|
|
4
|
+
}): naslTypes.ValidationRule;
|
|
3
5
|
//# sourceMappingURL=transform2ValidationRule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2ValidationRule.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2ValidationRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"transform2ValidationRule.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2ValidationRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAwB,MAAM,SAAS,CAAC;AAEtE,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,cAAc,CAkBpI"}
|
|
@@ -3,14 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.transform2ValidationRule = void 0;
|
|
4
4
|
const transform2LogicItem_1 = require("./transform2LogicItem");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
|
-
function transform2ValidationRule(node) {
|
|
6
|
+
function transform2ValidationRule(node, options) {
|
|
7
7
|
const callee = (0, utils_1.generate)(node.callee).code;
|
|
8
8
|
const calleeArr = callee.split('.');
|
|
9
|
+
const calleeName = calleeArr.pop();
|
|
10
|
+
const calleeNamespace = calleeArr.join('.');
|
|
11
|
+
if (calleeNamespace && calleeNamespace !== 'nasl.validation') {
|
|
12
|
+
return (0, utils_1.throwError)(options?.parsingId, 'rules 中的函数命令空间可以不填或必须为 nasl.validation', node);
|
|
13
|
+
}
|
|
9
14
|
const rule = new utils_1.naslTypes.ValidationRule({
|
|
10
|
-
calleeNamespace:
|
|
11
|
-
calleeName
|
|
15
|
+
calleeNamespace: 'nasl.validation',
|
|
16
|
+
calleeName,
|
|
12
17
|
arguments: node.arguments.map((arg) => new utils_1.naslTypes.Argument({
|
|
13
|
-
expression: (0, transform2LogicItem_1.transform2LogicItem)(arg, { transformType: 'attr' }),
|
|
18
|
+
expression: (0, transform2LogicItem_1.transform2LogicItem)(arg, { ...options, transformType: 'attr' }),
|
|
14
19
|
})),
|
|
15
20
|
});
|
|
16
21
|
return rule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2ValidationRule.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2ValidationRule.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"transform2ValidationRule.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2ValidationRule.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAC5D,mCAAsE;AAEtE,SAAgB,wBAAwB,CAAC,IAA+B,EAAE,OAAgC;IACxG,MAAM,MAAM,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5C,IAAI,eAAe,IAAI,eAAe,KAAK,iBAAiB,EAAE,CAAC;QAC7D,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,wCAAwC,EAAE,IAAI,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,iBAAS,CAAC,cAAc,CAAC;QACxC,eAAe,EAAE,iBAAiB;QAClC,UAAU;QACV,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,iBAAS,CAAC,QAAQ,CAAC;YAC1D,UAAU,EAAE,IAAA,yCAAmB,EAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;SAC9E,CAAC,CAAC;KACJ,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAlBD,4DAkBC"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { babelTypes, naslTypes } from './utils';
|
|
2
|
-
export declare function transform2BackendVariable(node: babelTypes.VariableDeclaration
|
|
3
|
-
|
|
2
|
+
export declare function transform2BackendVariable(node: babelTypes.VariableDeclaration, options: {
|
|
3
|
+
parsingId?: number;
|
|
4
|
+
}): naslTypes.BackendVariable | void;
|
|
5
|
+
export declare function transform2FrontendVariable(node: babelTypes.VariableDeclaration, options: {
|
|
6
|
+
parsingId?: number;
|
|
7
|
+
}): naslTypes.FrontendVariable | void;
|
|
4
8
|
//# sourceMappingURL=transform2Variable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2Variable.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAuG,MAAM,SAAS,CAAC;AAKrJ,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,UAAU,CAAC,mBAAmB,GAAG,SAAS,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"transform2Variable.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAuG,MAAM,SAAS,CAAC;AAKrJ,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EAAE,OAAO,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,eAAe,GAAG,IAAI,CAsBjJ;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EAAE,OAAO,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAsBnJ"}
|
|
@@ -4,12 +4,12 @@ exports.transform2FrontendVariable = exports.transform2BackendVariable = void 0;
|
|
|
4
4
|
const utils_1 = require("./utils");
|
|
5
5
|
const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
|
|
6
6
|
const transform2LogicItem_1 = require("./transform2LogicItem");
|
|
7
|
-
function transform2BackendVariable(node) {
|
|
7
|
+
function transform2BackendVariable(node, options) {
|
|
8
8
|
if (node.declarations.length !== 1)
|
|
9
|
-
(0, utils_1.throwError)(`VariableDeclaration should have only one declaration`);
|
|
9
|
+
return (0, utils_1.throwError)(options?.parsingId, `VariableDeclaration should have only one declaration`);
|
|
10
10
|
const declarator = node.declarations[0];
|
|
11
11
|
if (declarator.id.type !== 'Identifier')
|
|
12
|
-
(0, utils_1.throwError)(`VariableDeclarator 标识符应该是 Identifier`);
|
|
12
|
+
return (0, utils_1.throwError)(options?.parsingId, `VariableDeclarator 标识符应该是 Identifier`);
|
|
13
13
|
const id = declarator.id;
|
|
14
14
|
const variable = new utils_1.naslTypes.BackendVariable({
|
|
15
15
|
scope: 'request',
|
|
@@ -18,22 +18,22 @@ function transform2BackendVariable(node) {
|
|
|
18
18
|
variable.description = (0, utils_1.fetchFromComments)(node.leadingComments);
|
|
19
19
|
const typeAnnotation = id.typeAnnotation?.typeAnnotation;
|
|
20
20
|
if (typeAnnotation) {
|
|
21
|
-
variable.typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(typeAnnotation);
|
|
21
|
+
variable.typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(typeAnnotation, options) || undefined;
|
|
22
22
|
}
|
|
23
23
|
if (declarator.init) {
|
|
24
24
|
variable.defaultValue = new utils_1.naslTypes.DefaultValue({
|
|
25
|
-
expression: (0, transform2LogicItem_1.transform2LogicItem)(declarator.init, { transformType: 'attr' }),
|
|
25
|
+
expression: (0, transform2LogicItem_1.transform2LogicItem)(declarator.init, { ...options, transformType: 'attr' }),
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
return variable;
|
|
29
29
|
}
|
|
30
30
|
exports.transform2BackendVariable = transform2BackendVariable;
|
|
31
|
-
function transform2FrontendVariable(node) {
|
|
31
|
+
function transform2FrontendVariable(node, options) {
|
|
32
32
|
if (node.declarations.length !== 1)
|
|
33
|
-
(0, utils_1.throwError)(`VariableDeclaration should have only one declaration`);
|
|
33
|
+
return (0, utils_1.throwError)(options?.parsingId, `VariableDeclaration should have only one declaration`);
|
|
34
34
|
const declarator = node.declarations[0];
|
|
35
35
|
if (declarator.id.type !== 'Identifier')
|
|
36
|
-
(0, utils_1.throwError)(`VariableDeclarator 标识符应该是 Identifier`);
|
|
36
|
+
return (0, utils_1.throwError)(options?.parsingId, `VariableDeclarator 标识符应该是 Identifier`);
|
|
37
37
|
const id = declarator.id;
|
|
38
38
|
const variable = new utils_1.naslTypes.FrontendVariable({
|
|
39
39
|
localCache: false,
|
|
@@ -42,11 +42,11 @@ function transform2FrontendVariable(node) {
|
|
|
42
42
|
variable.description = (0, utils_1.fetchFromComments)(node.leadingComments);
|
|
43
43
|
const typeAnnotation = id.typeAnnotation?.typeAnnotation;
|
|
44
44
|
if (typeAnnotation) {
|
|
45
|
-
variable.typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(typeAnnotation);
|
|
45
|
+
variable.typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(typeAnnotation, options) || undefined;
|
|
46
46
|
}
|
|
47
47
|
if (declarator.init) {
|
|
48
48
|
variable.defaultValue = new utils_1.naslTypes.DefaultValue({
|
|
49
|
-
expression: (0, transform2LogicItem_1.transform2LogicItem)(declarator.init, { transformType: 'attr' }),
|
|
49
|
+
expression: (0, transform2LogicItem_1.transform2LogicItem)(declarator.init, { ...options, transformType: 'attr' }),
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
52
|
return variable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2Variable.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":";;;AAAA,mCAAqJ;AACrJ,yEAAsE;AAEtE,+DAA4D;AAE5D,SAAgB,yBAAyB,CAAC,IAAoC;
|
|
1
|
+
{"version":3,"file":"transform2Variable.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Variable.ts"],"names":[],"mappings":";;;AAAA,mCAAqJ;AACrJ,yEAAsE;AAEtE,+DAA4D;AAE5D,SAAgB,yBAAyB,CAAC,IAAoC,EAAE,OAA+B;IAC3G,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,sDAAsD,CAAC,CAAC;IAClI,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACxC,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,sCAAsC,CAAC,CAAC;IACvH,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;IACxB,QAAQ,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE/D,MAAM,cAAc,GAAI,EAAE,CAAC,cAA8C,EAAE,cAAc,CAAC;IAC1F,IAAI,cAAc,EAAE,CAAC;QACjB,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAC,cAAc,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC;IAC7F,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,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;SAC1F,CAAC,CAAC;IACP,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAtBD,8DAsBC;AAED,SAAgB,0BAA0B,CAAC,IAAoC,EAAE,OAA+B;IAC5G,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,sDAAsD,CAAC,CAAC;IAClI,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACxC,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,IAAA,kBAAU,EAAC,OAAO,EAAE,SAAS,EAAE,sCAAsC,CAAC,CAAC;IACvH,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;IACxB,QAAQ,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE/D,MAAM,cAAc,GAAI,EAAE,CAAC,cAA8C,EAAE,cAAc,CAAC;IAC1F,IAAI,cAAc,EAAE,CAAC;QACjB,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAC,cAAc,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC;IAC7F,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,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;SAC1F,CAAC,CAAC;IACP,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAtBD,gEAsBC"}
|
|
@@ -19,6 +19,10 @@ import { naslTypes } from './utils';
|
|
|
19
19
|
}
|
|
20
20
|
},
|
|
21
21
|
*/
|
|
22
|
-
export declare function transformTheme(css: string
|
|
23
|
-
|
|
22
|
+
export declare function transformTheme(css: string, options: {
|
|
23
|
+
parsingId?: number;
|
|
24
|
+
}): Record<string, Record<string, string>>;
|
|
25
|
+
export declare function transformStyle(css: string, options: {
|
|
26
|
+
parsingId?: number;
|
|
27
|
+
}): naslTypes.CSSRule[];
|
|
24
28
|
//# sourceMappingURL=transformThemeAndStyle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformThemeAndStyle.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transformThemeAndStyle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAc,MAAM,SAAS,CAAC;AAGhD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"transformThemeAndStyle.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transformThemeAndStyle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAc,MAAM,SAAS,CAAC;AAGhD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,0CAoC1E;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,uBAgC1E"}
|
|
@@ -48,7 +48,7 @@ const lodash_1 = require("lodash");
|
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
*/
|
|
51
|
-
function transformTheme(css) {
|
|
51
|
+
function transformTheme(css, options) {
|
|
52
52
|
const root = postcss.parse(css);
|
|
53
53
|
const map = {};
|
|
54
54
|
root.nodes.forEach((node) => {
|
|
@@ -71,23 +71,23 @@ function transformTheme(css) {
|
|
|
71
71
|
map[selector][decl.prop] = decl.value.trim();
|
|
72
72
|
}
|
|
73
73
|
else {
|
|
74
|
-
(0, utils_1.throwError)('$theme 中只支持 CSS 变量，不支持其他属性：' + decl.prop);
|
|
74
|
+
return (0, utils_1.throwError)(options?.parsingId, '$theme 中只支持 CSS 变量，不支持其他属性：' + decl.prop);
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
78
|
-
(0, utils_1.throwError)('不支持的节点类型：' + decl.type);
|
|
78
|
+
return (0, utils_1.throwError)(options?.parsingId, '不支持的节点类型：' + decl.type);
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
83
|
else {
|
|
84
|
-
(0, utils_1.throwError)('不支持的节点类型：' + node.type);
|
|
84
|
+
return (0, utils_1.throwError)(options?.parsingId, '不支持的节点类型：' + node.type);
|
|
85
85
|
}
|
|
86
86
|
});
|
|
87
87
|
return map;
|
|
88
88
|
}
|
|
89
89
|
exports.transformTheme = transformTheme;
|
|
90
|
-
function transformStyle(css) {
|
|
90
|
+
function transformStyle(css, options) {
|
|
91
91
|
const root = postcss.parse(css);
|
|
92
92
|
const cssRules = [];
|
|
93
93
|
root.nodes.forEach((node) => {
|
|
@@ -103,7 +103,7 @@ function transformStyle(css) {
|
|
|
103
103
|
Object.assign(declarations, getChildrenDeclaration(decl));
|
|
104
104
|
}
|
|
105
105
|
else {
|
|
106
|
-
(0, utils_1.throwError)('不支持的节点类型：' + decl.type);
|
|
106
|
+
return (0, utils_1.throwError)(options?.parsingId, '不支持的节点类型：' + decl.type);
|
|
107
107
|
}
|
|
108
108
|
});
|
|
109
109
|
cssRules.push({
|
|
@@ -113,7 +113,7 @@ function transformStyle(css) {
|
|
|
113
113
|
});
|
|
114
114
|
}
|
|
115
115
|
else {
|
|
116
|
-
(0, utils_1.throwError)('不支持的节点类型：' + node.type);
|
|
116
|
+
return (0, utils_1.throwError)(options?.parsingId, '不支持的节点类型：' + node.type);
|
|
117
117
|
}
|
|
118
118
|
});
|
|
119
119
|
return cssRules.map((cssRule) => new utils_1.naslTypes.CSSRule(cssRule));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformThemeAndStyle.js","sourceRoot":"","sources":["../../../src/natural/transforms/transformThemeAndStyle.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAmC;AACnC,iEAAuE;AACvE,mCAAgD;AAChD,mCAA+C;AAE/C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,cAAc,CAAC,GAAW;
|
|
1
|
+
{"version":3,"file":"transformThemeAndStyle.js","sourceRoot":"","sources":["../../../src/natural/transforms/transformThemeAndStyle.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,14 @@ import * as naslTypes from '../../concepts';
|
|
|
4
4
|
import generate from '@babel/generator';
|
|
5
5
|
export { babelTypes, naslTypes, generate };
|
|
6
6
|
export declare function DEBUG(): boolean;
|
|
7
|
+
export declare const parseNaturalTSErrorMap: Record<number, Array<string>>;
|
|
7
8
|
/**
|
|
8
9
|
* 抛出错误
|
|
9
10
|
* @param message 错误信息
|
|
10
11
|
* @param babelNode babel节点，用于便捷生成代码片段信息
|
|
11
12
|
* @param babelNode2 babel节点，用于便捷生成代码片段信息
|
|
12
13
|
*/
|
|
13
|
-
export declare function throwError(message: string, babelNode?: babelTypes.Node | string, babelNode2?: babelTypes.Node | string):
|
|
14
|
+
export declare function throwError(parsingId: number | undefined, message: string, babelNode?: babelTypes.Node | string, babelNode2?: babelTypes.Node | string): undefined;
|
|
14
15
|
/**
|
|
15
16
|
* 抛出警告，在 DEBUG 模式下不抛出这类错误
|
|
16
17
|
* @param message 错误信息
|
|
@@ -32,8 +33,12 @@ export declare const replaceCallFunctionMap: {
|
|
|
32
33
|
COUNTD: string;
|
|
33
34
|
};
|
|
34
35
|
export declare function upgradeListSort(node: any): any;
|
|
35
|
-
export declare function handleListSort(node:
|
|
36
|
+
export declare function handleListSort(node: naslTypes.CallFunction, options: {
|
|
37
|
+
parsingId?: number;
|
|
38
|
+
}): naslTypes.CallFunction | void;
|
|
36
39
|
export declare function fetchFromComments(comments?: Array<babelTypes.Comment | babelTypes.CommentBlock>): string;
|
|
37
40
|
export declare function checkOQLCalleeNameOrder(calleeNames: Array<string>): boolean;
|
|
38
|
-
export declare function pickDecoratorObject(objectExpression: babelTypes.ObjectExpression, keys: Set<string
|
|
41
|
+
export declare function pickDecoratorObject(objectExpression: babelTypes.ObjectExpression, keys: Set<string>, options: {
|
|
42
|
+
parsingId?: number;
|
|
43
|
+
}): Record<string, any>;
|
|
39
44
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAG3C,wBAAgB,KAAK,YAEpB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,IAAI,GAAG,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,CAAC,IAAI,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAG3C,wBAAgB,KAAK,YAEpB;AAED,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM,CAAC;AAExE;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,IAAI,GAAG,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,CAAC,IAAI,GAAG,MAAM,GAAG,SAAS,CAoBjK;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,IAAI,GAAG,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,CAAC,IAAI,GAAG,MAAM,QAYxH;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,yDAWxC;AAED,eAAO,MAAM,eAAe,UA4F3B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;CAUlC,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,OAoFxC;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,YAAY,GAAG,IAAI,CAgC3H;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,UAG/F;AAYD,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,WAmBjE;AAED,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,uBAsBpI"}
|
|
@@ -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.pickDecoratorObject = exports.checkOQLCalleeNameOrder = exports.fetchFromComments = exports.handleListSort = exports.upgradeListSort = exports.replaceCallFunctionMap = exports.callFunctionMap = exports.tryParseTS = exports.throwWarning = exports.throwError = exports.DEBUG = exports.generate = exports.naslTypes = exports.babelTypes = void 0;
|
|
29
|
+
exports.pickDecoratorObject = exports.checkOQLCalleeNameOrder = exports.fetchFromComments = exports.handleListSort = exports.upgradeListSort = exports.replaceCallFunctionMap = exports.callFunctionMap = exports.tryParseTS = exports.throwWarning = exports.throwError = exports.parseNaturalTSErrorMap = exports.DEBUG = 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;
|
|
@@ -39,13 +39,14 @@ function DEBUG() {
|
|
|
39
39
|
return process.env.NATURAL_TS_THROW_ERROR === 'true';
|
|
40
40
|
}
|
|
41
41
|
exports.DEBUG = DEBUG;
|
|
42
|
+
exports.parseNaturalTSErrorMap = {};
|
|
42
43
|
/**
|
|
43
44
|
* 抛出错误
|
|
44
45
|
* @param message 错误信息
|
|
45
46
|
* @param babelNode babel节点，用于便捷生成代码片段信息
|
|
46
47
|
* @param babelNode2 babel节点，用于便捷生成代码片段信息
|
|
47
48
|
*/
|
|
48
|
-
function throwError(message, babelNode, babelNode2) {
|
|
49
|
+
function throwError(parsingId, message, babelNode, babelNode2) {
|
|
49
50
|
if (babelNode) {
|
|
50
51
|
let code = typeof babelNode === 'string' ? babelNode : (0, generator_1.default)(babelNode).code;
|
|
51
52
|
message += '：' + code.slice(0, 1000);
|
|
@@ -54,7 +55,18 @@ function throwError(message, babelNode, babelNode2) {
|
|
|
54
55
|
let code = typeof babelNode2 === 'string' ? babelNode2 : (0, generator_1.default)(babelNode2).code;
|
|
55
56
|
message += '\n' + code.slice(0, 1000);
|
|
56
57
|
}
|
|
57
|
-
|
|
58
|
+
if (!parsingId) {
|
|
59
|
+
throw new Error(message);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
const keys = Object.keys(exports.parseNaturalTSErrorMap).map(Number).sort();
|
|
63
|
+
keys.forEach((key) => {
|
|
64
|
+
if (parsingId - key > 1000 * 60 * 60)
|
|
65
|
+
delete exports.parseNaturalTSErrorMap[key];
|
|
66
|
+
});
|
|
67
|
+
const errors = exports.parseNaturalTSErrorMap[parsingId] = exports.parseNaturalTSErrorMap[parsingId] || [];
|
|
68
|
+
errors.push(message);
|
|
69
|
+
}
|
|
58
70
|
}
|
|
59
71
|
exports.throwError = throwError;
|
|
60
72
|
/**
|
|
@@ -281,11 +293,11 @@ function upgradeListSort(node) {
|
|
|
281
293
|
return node;
|
|
282
294
|
}
|
|
283
295
|
exports.upgradeListSort = upgradeListSort;
|
|
284
|
-
function handleListSort(node) {
|
|
296
|
+
function handleListSort(node, options) {
|
|
285
297
|
const args = node?.arguments;
|
|
286
298
|
if (args?.[args?.length - 1]?.expression?.concept === 'BooleanLiteral') {
|
|
287
299
|
if (DEBUG)
|
|
288
|
-
throwError('调用 ListSort 函数需要使用最新的写法');
|
|
300
|
+
return throwError(options?.parsingId, '调用 ListSort 函数需要使用最新的写法');
|
|
289
301
|
// 老的 ListSort 结构'nasl.util.ListSort(variable1, (item) => item, true)'，要升级成新的
|
|
290
302
|
return upgradeListSort(node);
|
|
291
303
|
}
|
|
@@ -349,7 +361,7 @@ function checkOQLCalleeNameOrder(calleeNames) {
|
|
|
349
361
|
return true;
|
|
350
362
|
}
|
|
351
363
|
exports.checkOQLCalleeNameOrder = checkOQLCalleeNameOrder;
|
|
352
|
-
function pickDecoratorObject(objectExpression, keys) {
|
|
364
|
+
function pickDecoratorObject(objectExpression, keys, options) {
|
|
353
365
|
const result = {};
|
|
354
366
|
objectExpression.properties.forEach((item) => {
|
|
355
367
|
if (item.type === 'ObjectProperty' && item.key.type === 'Identifier' && keys.has(item.key.name)) {
|
|
@@ -367,12 +379,12 @@ function pickDecoratorObject(objectExpression, keys) {
|
|
|
367
379
|
value = item.value.value;
|
|
368
380
|
}
|
|
369
381
|
else {
|
|
370
|
-
throwError('不支持的装饰器对象属性值：' + (0, generator_1.default)(item).code);
|
|
382
|
+
return throwError(options?.parsingId, '不支持的装饰器对象属性值：' + (0, generator_1.default)(item).code);
|
|
371
383
|
}
|
|
372
384
|
result[item.key.name] = value;
|
|
373
385
|
}
|
|
374
386
|
else {
|
|
375
|
-
throwError('不支持的装饰器对象属性：' + (0, generator_1.default)(item).code);
|
|
387
|
+
return throwError(options?.parsingId, '不支持的装饰器对象属性：' + (0, generator_1.default)(item).code);
|
|
376
388
|
}
|
|
377
389
|
});
|
|
378
390
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/natural/transforms/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,yDAA2C;AAIlC,gCAAU;AAHnB,0DAA4C;AAGvB,8BAAS;AAF9B,iEAAwC;AAER,mBAFzB,mBAAQ,CAEyB;AAExC,uEAAuE;AACvE,SAAgB,KAAK;IACnB,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,MAAM,CAAC;AACvD,CAAC;AAFD,sBAEC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/natural/transforms/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findReference.d.ts","sourceRoot":"","sources":["../../src/server/findReference.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,QAAQ,EAaX,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EACH,UAAU,EAEV,MAAM,EAET,MAAM,iCAAiC,CAAC;AAIzC,KAAK,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAGrD,eAAO,MAAM,sBAAsB,WAAkB,MAAM,UAAU,UAAU,
|
|
1
|
+
{"version":3,"file":"findReference.d.ts","sourceRoot":"","sources":["../../src/server/findReference.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,QAAQ,EAaX,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EACH,UAAU,EAEV,MAAM,EAET,MAAM,iCAAiC,CAAC;AAIzC,KAAK,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAGrD,eAAO,MAAM,sBAAsB,WAAkB,MAAM,UAAU,UAAU,2BAiD9E,CAAA;AAID,eAAO,MAAM,WAAW,YAAa,QAAQ,UAAU,IAAI,QAAQ,EAAE,MAAM,MAAM,SAAS,CAAC,CAAC,CAAC,WAAW,IAAI,QAAQ,EAAE,SAAS,CAAC,SAgF7H,CAAA;AAGH,eAAO,MAAM,aAAa,WAAY,IAAI,QAAQ,EAAE,MAAM,MAAM,SAAS,CAAC,CAAC,CAAC,kBAQ3E,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,eAAgB,MAAM,MAAM,SAAS,CAAC,CAAC,cAuBlE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,SAAU,SAAS,OAAO,IAAI,SAAS,EAAE,MAAM,SAAS,CAAC,CAAC,cAM5F,CAAA"}
|
|
@@ -49,6 +49,10 @@ const findReferenceAndRender = async (semEnv, __node) => {
|
|
|
49
49
|
if (node.parentNode?.concept === 'BindEvent') {
|
|
50
50
|
refs.push(node);
|
|
51
51
|
}
|
|
52
|
+
// 产品上的功能：子逻辑的 查找引用 能看到自己
|
|
53
|
+
if (node.concept === 'SubLogic') {
|
|
54
|
+
refs.push(node);
|
|
55
|
+
}
|
|
52
56
|
// 不显示实体逻辑里的引用
|
|
53
57
|
refs = refs.filter(ref => !(0, nasl_language_server_core_1.isEntityLogic)((0, service_1.getFileNode)(ref)));
|
|
54
58
|
utils.isDebugMode && console.timeEnd('\x1b[44m\x1b[97m Find references: find \x1b[0m');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findReference.js","sourceRoot":"","sources":["../../src/server/findReference.ts"],"names":[],"mappings":";AAAA,+CAA+C;AAC/C,0CAA0C;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1C,0CAcqB;AAIrB,gDAAkC;AAElC,+EAKyC;AAEzC,yDAA0D;AAI1D,wBAAwB;AACjB,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAkB,EAAE,EAAE;IAC/E,uBAAuB;IACvB,MAAM,aAAa,GAAG,CAAC,EAAc,EAAE,EAAE;QACrC,IAAI,EAAE,CAAC,OAAO,KAAK,OAAO,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAA;IAED,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;IACpF,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE5D,0BAA0B;IAC1B,IAAI,IAAI,CAAC,UAAU,EAAE,OAAO,KAAK,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;IAC3B,CAAC;
|
|
1
|
+
{"version":3,"file":"findReference.js","sourceRoot":"","sources":["../../src/server/findReference.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.1.0-creator.
|
|
4
|
+
"version": "4.1.0-creator.10",
|
|
5
5
|
"author": "Forrest <rainforest92@126.com>",
|
|
6
6
|
"main": "./out",
|
|
7
7
|
"types": "./out/index.d.ts",
|
|
@@ -79,15 +79,15 @@
|
|
|
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-
|
|
83
|
-
"@lcap/nasl-
|
|
84
|
-
"@lcap/nasl-
|
|
85
|
-
"@lcap/nasl-
|
|
86
|
-
"@lcap/nasl-
|
|
87
|
-
"@lcap/nasl-
|
|
88
|
-
"@lcap/nasl-
|
|
89
|
-
"@lcap/nasl-
|
|
90
|
-
"@lcap/nasl-
|
|
82
|
+
"@lcap/nasl-translator": "4.1.0-creator.10",
|
|
83
|
+
"@lcap/nasl-log": "4.1.0-creator.10",
|
|
84
|
+
"@lcap/nasl-types": "4.1.0-creator.10",
|
|
85
|
+
"@lcap/nasl-sentry": "4.1.0-creator.10",
|
|
86
|
+
"@lcap/nasl-concepts": "4.1.0-creator.10",
|
|
87
|
+
"@lcap/nasl-unified-frontend-generator": "4.1.0-creator.10",
|
|
88
|
+
"@lcap/nasl-breakpoint": "4.1.0-creator.10",
|
|
89
|
+
"@lcap/nasl-utils": "4.1.0-creator.10",
|
|
90
|
+
"@lcap/nasl-language-server-core": "4.1.0-creator.10"
|
|
91
91
|
},
|
|
92
92
|
"devDependencies": {
|
|
93
93
|
"@babel/preset-react": "7.24.1",
|