@lcap/nasl 4.4.0-beta.32 → 4.4.0-beta.34
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/generator/ui-library-declaration/types.d.ts +2 -0
- package/out/generator/ui-library-declaration/types.d.ts.map +1 -1
- package/out/index.d.ts +2 -2
- package/out/index.d.ts.map +1 -1
- package/out/index.js +6 -1
- package/out/index.js.map +1 -1
- package/out/manager/diagnostic.d.ts +5 -5
- package/out/manager/diagnostic.d.ts.map +1 -1
- package/out/natural/exports/nasl2Files.d.ts.map +1 -1
- package/out/natural/exports/nasl2Files.js +23 -1
- package/out/natural/exports/nasl2Files.js.map +1 -1
- package/out/natural/exports/transform2BatchActions/diff/nodes.d.ts +24 -1
- package/out/natural/exports/transform2BatchActions/diff/nodes.d.ts.map +1 -1
- package/out/natural/exports/transform2BatchActions/diff/nodes.js +88 -1
- package/out/natural/exports/transform2BatchActions/diff/nodes.js.map +1 -1
- package/out/natural/exports/transform2BatchActions/index.d.ts +1 -0
- package/out/natural/exports/transform2BatchActions/index.d.ts.map +1 -1
- package/out/natural/exports/transform2BatchActions/index.js +3 -1
- package/out/natural/exports/transform2BatchActions/index.js.map +1 -1
- package/out/natural/exports/transform2BatchActions/parse.d.ts +11 -1
- package/out/natural/exports/transform2BatchActions/parse.d.ts.map +1 -1
- package/out/natural/exports/transform2BatchActions/parse.js +22 -3
- package/out/natural/exports/transform2BatchActions/parse.js.map +1 -1
- package/out/natural/exports/transform2BatchActions/types.d.ts +15 -2
- package/out/natural/exports/transform2BatchActions/types.d.ts.map +1 -1
- package/out/natural/old/parser/transformTS2UI.js +1 -1
- package/out/natural/old/parser/transformTS2UI.js.map +1 -1
- package/out/natural/old/parser/transformTSCode.js +1 -1
- package/out/natural/old/parser/transformTSCode.js.map +1 -1
- package/out/natural/parser/parseNaturalTS.d.ts.map +1 -1
- package/out/natural/parser/parseNaturalTS.js +46 -0
- 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 +8 -31
- package/out/natural/parser/parseNaturalTSXView.js.map +1 -1
- package/out/natural/transforms/checker/checkIdentifierName.d.ts +6 -0
- package/out/natural/transforms/checker/checkIdentifierName.d.ts.map +1 -0
- package/out/natural/transforms/checker/checkIdentifierName.js +15 -0
- package/out/natural/transforms/checker/checkIdentifierName.js.map +1 -0
- package/out/natural/transforms/checker/checkViewElement.d.ts.map +1 -1
- package/out/natural/transforms/checker/checkViewElement.js +2 -0
- package/out/natural/transforms/checker/checkViewElement.js.map +1 -1
- package/out/natural/transforms/checker/index.d.ts +1 -0
- package/out/natural/transforms/checker/index.d.ts.map +1 -1
- package/out/natural/transforms/checker/index.js +3 -1
- package/out/natural/transforms/checker/index.js.map +1 -1
- package/out/natural/transforms/transform2Config.d.ts +17 -0
- package/out/natural/transforms/transform2Config.d.ts.map +1 -0
- package/out/natural/transforms/transform2Config.js +114 -0
- package/out/natural/transforms/transform2Config.js.map +1 -0
- package/out/natural/transforms/transform2Entity.d.ts +2 -2
- package/out/natural/transforms/transform2Entity.d.ts.map +1 -1
- package/out/natural/transforms/transform2Entity.js +5 -2
- package/out/natural/transforms/transform2Entity.js.map +1 -1
- package/out/natural/transforms/transform2GlobalLogicDeclaration.js +1 -1
- 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 -12
- package/out/natural/transforms/transform2Logic.js.map +1 -1
- package/out/natural/transforms/transform2LogicItem.d.ts +1 -0
- package/out/natural/transforms/transform2LogicItem.d.ts.map +1 -1
- package/out/natural/transforms/transform2LogicItem.js +88 -35
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/natural/transforms/transform2Param.d.ts +1 -1
- package/out/natural/transforms/transform2Param.d.ts.map +1 -1
- package/out/natural/transforms/transform2Param.js +12 -1
- package/out/natural/transforms/transform2Param.js.map +1 -1
- package/out/natural/transforms/transform2Variable.d.ts.map +1 -1
- package/out/natural/transforms/transform2Variable.js +4 -0
- package/out/natural/transforms/transform2Variable.js.map +1 -1
- package/out/natural/transforms/utils/ensureBindRoles.d.ts +9 -0
- package/out/natural/transforms/utils/ensureBindRoles.d.ts.map +1 -0
- package/out/natural/transforms/utils/ensureBindRoles.js +25 -0
- package/out/natural/transforms/utils/ensureBindRoles.js.map +1 -0
- package/out/natural/transforms/utils/flattenStatementsWithComments.d.ts +11 -0
- package/out/natural/transforms/utils/flattenStatementsWithComments.d.ts.map +1 -0
- package/out/natural/transforms/utils/flattenStatementsWithComments.js +36 -0
- package/out/natural/transforms/utils/flattenStatementsWithComments.js.map +1 -0
- package/out/natural/transforms/utils/parseDecorator.d.ts.map +1 -1
- package/out/natural/transforms/utils/parseDecorator.js +5 -9
- package/out/natural/transforms/utils/parseDecorator.js.map +1 -1
- package/out/natural/utils/index.d.ts +2 -0
- package/out/natural/utils/index.d.ts.map +1 -1
- package/out/natural/utils/index.js.map +1 -1
- package/out/natural/utils/nasl-file-types.d.ts +6 -1
- package/out/natural/utils/nasl-file-types.d.ts.map +1 -1
- package/out/natural/utils/nasl-file-types.js +49 -2
- package/out/natural/utils/nasl-file-types.js.map +1 -1
- package/out/server/extendBaseNode.js +4 -4
- package/out/server/extendBaseNode.js.map +1 -1
- package/out/server/index.d.ts +1 -0
- package/out/server/index.d.ts.map +1 -1
- package/out/server/index.js +6 -1
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +2 -0
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +11 -5
- package/out/server/naslServer.js.map +1 -1
- package/out/server/naslUiComponentTs.d.ts +16 -0
- package/out/server/naslUiComponentTs.d.ts.map +1 -0
- package/out/server/naslUiComponentTs.default.d.ts +47 -0
- package/out/server/naslUiComponentTs.js +111 -0
- package/out/server/naslUiComponentTs.js.map +1 -0
- package/out/service/autofix/types.d.ts +2 -2
- package/out/service/autofix/types.d.ts.map +1 -1
- package/out/service/instruct-ruler/ruler.d.ts +3 -1
- package/out/service/instruct-ruler/ruler.d.ts.map +1 -1
- package/out/service/instruct-ruler/ruler.js +2 -1
- package/out/service/instruct-ruler/ruler.js.map +1 -1
- package/out/service/storage/init.d.ts +5 -0
- package/out/service/storage/init.d.ts.map +1 -1
- package/out/service/storage/init.js +2 -1
- package/out/service/storage/init.js.map +1 -1
- package/out/service/storage/specTools.d.ts.map +1 -1
- package/out/service/storage/specTools.js +14 -5
- package/out/service/storage/specTools.js.map +1 -1
- package/out/templator/genQueryComponent.d.ts +13 -1
- package/out/templator/genQueryComponent.d.ts.map +1 -1
- package/out/templator/genQueryComponent.js +18 -14
- package/out/templator/genQueryComponent.js.map +1 -1
- package/package.json +10 -10
- package/sandbox/stdlib/nasl.util.ts +16 -15
|
@@ -33,12 +33,15 @@ const DATABASE_TYPE_PARAM_NAMES = {
|
|
|
33
33
|
// - DATE、TIME、DATETIME、TIMESTAMP
|
|
34
34
|
/**
|
|
35
35
|
* 将节点转换为 DatabaseTypeAnnotation 实例
|
|
36
|
-
* @param node
|
|
36
|
+
* @param node 数据库类型注解的节点（标识符、调用表达式；字符串字面量等非法形式会报错提示）
|
|
37
37
|
* @param parseState 解析状态
|
|
38
38
|
* @returns DatabaseTypeAnnotation 实例
|
|
39
39
|
*/
|
|
40
40
|
function transform2DatabaseTypeAnnotation(node, parseState) {
|
|
41
|
-
if (node.type === '
|
|
41
|
+
if (node.type === 'StringLiteral') {
|
|
42
|
+
return (0, utils_1.throwError)(parseState, `dbType 不支持字符串形式，请使用标识符或调用表达式形式：` + (0, utils_1.generate)(node).code);
|
|
43
|
+
}
|
|
44
|
+
else if (node.type === 'Identifier') {
|
|
42
45
|
// 标识符形式（如 SMALLINT）
|
|
43
46
|
return new utils_1.naslTypes.DatabaseTypeAnnotation({
|
|
44
47
|
typeName: node.name.toLowerCase(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2Entity.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Entity.ts"],"names":[],"mappings":";;;AAAA,oCAA4H;AAC5H,uCAA+D;AAC/D,yEAAsE;AACtE,2DAKgC;AAEhC;;;;GAIG;AACH,MAAM,yBAAyB,GAA6B;IAC1D,KAAK;IACL,OAAO,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC;IAC/B,OAAO,EAAE,CAAC,WAAW,CAAC;IACtB,GAAG,EAAE,CAAC,WAAW,CAAC;IAClB,IAAI,EAAE,CAAC,WAAW,CAAC;IACnB,KAAK;IACL,GAAG,EAAE,CAAC,cAAc,CAAC;IACrB,OAAO,EAAE,CAAC,cAAc,CAAC;IACzB,QAAQ,EAAE,CAAC,cAAc,CAAC;IAC1B,MAAM,EAAE,CAAC,cAAc,CAAC;IACxB,SAAS,EAAE,CAAC,cAAc,CAAC;IAC3B,OAAO,EAAE,CAAC,cAAc,CAAC;IACzB,MAAM;IACN,OAAO,EAAE,CAAC,QAAQ,CAAC;IACnB,IAAI,EAAE,CAAC,QAAQ,CAAC;CACjB,CAAC;AACF,SAAS;AACT,sCAAsC;AACtC,iBAAiB;AACjB,iCAAiC;AAEjC;;;;;GAKG;AACH,SAAgB,gCAAgC,CAC9C,
|
|
1
|
+
{"version":3,"file":"transform2Entity.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ function transform2GlobalLogicDeclaration(node, decorator, parseState) {
|
|
|
13
13
|
new utils_1.naslTypes.Start(),
|
|
14
14
|
new utils_1.naslTypes.End(),
|
|
15
15
|
];
|
|
16
|
-
logic.params = node.params.map((param) => (0, transform2Param_1.transform2Param)(param, { ...parseState, transformType: 'attr' })).filter(Boolean);
|
|
16
|
+
logic.params = node.params.map((param) => (0, transform2Param_1.transform2Param)(param, { ...parseState, transformType: 'attr' }, undefined, true)).filter(Boolean);
|
|
17
17
|
if (node.returnType && node.returnType.typeAnnotation.type !== 'TSVoidKeyword') {
|
|
18
18
|
logic.returns.push(new utils_1.naslTypes.Return({
|
|
19
19
|
name: 'result',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2GlobalLogicDeclaration.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":";;;AAAA,oCAA8F;AAC9F,yEAAsE;AACtE,uDAAoD;AACpD,2DAA8E;AAE9E,SAAgB,gCAAgC,CAC5C,IAAkC,EAClC,SAAgD,EAChD,UAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,iBAAS,CAAC,KAAK,EAAE,CAAC;IACpC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAChD,KAAK,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5D,KAAK,CAAC,IAAI,GAAG;QACT,IAAI,iBAAS,CAAC,KAAK,EAAE;QACrB,IAAI,iBAAS,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iCAAe,EAAC,KAA6D,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"transform2GlobalLogicDeclaration.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":";;;AAAA,oCAA8F;AAC9F,yEAAsE;AACtE,uDAAoD;AACpD,2DAA8E;AAE9E,SAAgB,gCAAgC,CAC5C,IAAkC,EAClC,SAAgD,EAChD,UAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,iBAAS,CAAC,KAAK,EAAE,CAAC;IACpC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAChD,KAAK,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5D,KAAK,CAAC,IAAI,GAAG;QACT,IAAI,iBAAS,CAAC,KAAK,EAAE;QACrB,IAAI,iBAAS,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iCAAe,EAAC,KAA6D,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAsB,CAAC;IAC1N,IAAI,IAAI,CAAC,UAAU,IAAK,IAAI,CAAC,UAA0C,CAAC,cAAc,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC9G,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,cAAc,EAAE,IAAA,mDAAwB,EAAE,IAAI,CAAC,UAA0C,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS;SACrI,CAAC,CAAC,CAAC;IACR,CAAC;IAED,gBAAgB;IAChB,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,IAAA,oCAAmB,EACrC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,gCAAe,CAAC,WAAW,EAC3B,gCAAe,CAAC,QAAQ,IAAI,EAAE,EAC9B,UAAU,CACb,CAAC;QAEF,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;YAC5B,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAClD,CAAC;QACD,IAAI,aAAa,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,CAAC,aAAa,GAAG,IAAI,iBAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACvC,KAAa,CAAC,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC;QAC5D,CAAC;QACD,IAAI,aAAa,CAAC,iBAAiB,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,aAAa,CAAC,iBAAiB,CAAC;QACnE,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AA7CD,4EA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2Logic.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA+C,KAAK,eAAe,EAAuB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"transform2Logic.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA+C,KAAK,eAAe,EAAuB,MAAM,UAAU,CAAC;AAazI,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,gBAAgB,EAAE,MAAM,EACxB,sBAAsB,EAAE,UAAU,CAAC,WAAW,EAC9C,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CA4HjB;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,EACxE,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAiBjB;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,GAAG,UAAU,CAAC,mBAAmB,EACzG,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAMjB"}
|
|
@@ -6,6 +6,7 @@ const transform2LogicItem_1 = require("./transform2LogicItem");
|
|
|
6
6
|
const transform2Param_1 = require("./transform2Param");
|
|
7
7
|
const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
|
|
8
8
|
const parseDecorator_1 = require("./utils/parseDecorator");
|
|
9
|
+
const flattenStatementsWithComments_1 = require("./utils/flattenStatementsWithComments");
|
|
9
10
|
function getLogicType(options) {
|
|
10
11
|
if (options?.nodeNamespace?.includes('app.logics'))
|
|
11
12
|
return 'global_logic';
|
|
@@ -28,17 +29,7 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
|
|
|
28
29
|
statements = statements.filter((stat) => stat.start > currentPositionComment.start);
|
|
29
30
|
}
|
|
30
31
|
logic.description = (0, utils_1.fetchFromComments)(func.leadingComments);
|
|
31
|
-
|
|
32
|
-
statements.forEach((node, index) => {
|
|
33
|
-
if (node?.leadingComments?.length) {
|
|
34
|
-
newStatements.push(...node?.leadingComments);
|
|
35
|
-
}
|
|
36
|
-
newStatements.push(node);
|
|
37
|
-
if (node?.trailingComments?.length && index === statements.length - 1) {
|
|
38
|
-
newStatements.push(...node?.trailingComments);
|
|
39
|
-
}
|
|
40
|
-
});
|
|
41
|
-
statements = newStatements;
|
|
32
|
+
statements = (0, flattenStatementsWithComments_1.flattenStatementsWithComments)(statements, { nodeBeforeTrailing: true });
|
|
42
33
|
if (parameters?.length === 1 && parameters?.[0]?.type === 'ObjectPattern') {
|
|
43
34
|
// interface 特殊处理
|
|
44
35
|
const properties = parameters?.[0]?.typeAnnotation?.typeAnnotation?.members;
|
|
@@ -48,7 +39,7 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
|
|
|
48
39
|
}
|
|
49
40
|
parameters.forEach((node) => {
|
|
50
41
|
let param;
|
|
51
|
-
param = (0, transform2Param_1.transform2Param)(node, { ...options, transformType: 'attr' }) || undefined;
|
|
42
|
+
param = (0, transform2Param_1.transform2Param)(node, { ...options, transformType: 'attr' }, undefined, true) || undefined;
|
|
52
43
|
param && logic.params.push(param);
|
|
53
44
|
});
|
|
54
45
|
let returnDecorator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2Logic.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":";;;AAAA,oCAAyI;AACzI,+DAA4D;AAC5D,uDAAoD;AACpD,yEAAsE;AACtE,2DAAsH;
|
|
1
|
+
{"version":3,"file":"transform2Logic.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,6 +135,7 @@ export declare function transformCall2Extension(node: babelTypes.CallExpression,
|
|
|
135
135
|
export declare function transformCall2CallViewLogic(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
|
|
136
136
|
export declare function transformCall2Logic(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | naslTypes.CallFunction | naslTypes.CallFunction | naslTypes.MemberExpression | void;
|
|
137
137
|
export declare function transformCall2LogicWithAuth(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
|
|
138
|
+
export declare function transformCall2GetCustomConfig(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
|
|
138
139
|
export declare function transformCall2Paginate(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.Paginate;
|
|
139
140
|
type CallQueryComponentChainNode = {
|
|
140
141
|
calleeName: 'FROM' | 'INNER_JOIN' | 'LEFT_JOIN' | 'RIGHT_JOIN' | 'OUTER_JOIN';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.transformCall2Interface = exports.transformAlert2ShowMessage = exports.transformForEach2ForEachStatement = exports.transformForOf2ForEachStatement = exports.transform2ForEachStatement = exports.transformMap2ListTransform = exports.transform2UIFunction = exports.transformCall2CallFunction = exports.transform2CallFunction = exports.transform2CallOtherNASLLogic = exports.transform2CallEventLogic = exports.transformCall2JSONFunctions = exports.transformCall2Logging = exports.transformCall2ConsoleLog = exports.transformCall2CallDataSourceLogic = exports.transformCall2CallEntityLogic = exports.transformCall2CallViewElementLogic = exports.transformCallFunctionExpression2Match = exports.transformMemberExpression = exports.transformNewExpression = exports.transform2NewRegex = exports.transform2PartialNewComposite = exports.transform2Comment = exports.transform2StringInterpolation = exports.transformReturnStatement2AssignmentOrEnd = exports.transform2NullLiteral = exports.transform2NumericLiteral = exports.transform2DirectiveLiteral = exports.transform2StringLiteral = exports.transform2BooleanLiteral = exports.transformUpdateExpression2Assignment = exports.transform2Assignment = exports.transform2AnonymousFunction = exports.transformIdentifier = exports.transformSwitchStatement2Match = exports.transform2WhileStatement = exports.transform2Break = exports.transform2Continue = exports.transform2IfStatement = exports.transform2BinaryExpression = exports.transform2VariadicExpression = exports.transformCallExpressionToBinaryExpression = exports.fixLogicNode = exports.flatIfStatementForMatch = exports.flatMatchPatternsExpression = exports.getSelectMembers = exports.unflatMemberExpression = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
|
|
7
|
-
exports.transform2LogicItem = exports.transform2DefaultValue = exports.transformNode2Directory = exports.transformCall2Paginate = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = void 0;
|
|
7
|
+
exports.transform2LogicItem = exports.transform2DefaultValue = exports.transformNode2Directory = exports.transformCall2Paginate = exports.transformCall2GetCustomConfig = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = void 0;
|
|
8
8
|
const utils_1 = require("../utils");
|
|
9
9
|
const misc_1 = require("./utils/misc");
|
|
10
|
+
const flattenStatementsWithComments_1 = require("./utils/flattenStatementsWithComments");
|
|
10
11
|
const checkDataQueryCalleeNameOrder_1 = require("./checker/checkDataQueryCalleeNameOrder");
|
|
12
|
+
const checkIdentifierName_1 = require("./checker/checkIdentifierName");
|
|
11
13
|
const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
|
|
12
14
|
const transform2Param_1 = require("./transform2Param");
|
|
13
15
|
const server_1 = __importDefault(require("../../server"));
|
|
@@ -80,23 +82,13 @@ function transformTSCode2SubLogic(node, options) {
|
|
|
80
82
|
statements = [...node?.body?.directives, ...node?.body?.body];
|
|
81
83
|
}
|
|
82
84
|
parameters.forEach((node) => {
|
|
83
|
-
const param = (0, transform2Param_1.transform2Param)(node, options);
|
|
85
|
+
const param = (0, transform2Param_1.transform2Param)(node, options, undefined, true);
|
|
84
86
|
if (param && !param?.typeAnnotation) {
|
|
85
87
|
param.typeAnnotation = null;
|
|
86
88
|
}
|
|
87
89
|
param && logic.addParam(param);
|
|
88
90
|
});
|
|
89
|
-
|
|
90
|
-
statements.forEach((node, index) => {
|
|
91
|
-
if (node?.leadingComments?.length) {
|
|
92
|
-
newStatements.push(...node?.leadingComments);
|
|
93
|
-
}
|
|
94
|
-
if (node?.trailingComments?.length && index === statements.length - 1) {
|
|
95
|
-
newStatements.push(...node?.trailingComments);
|
|
96
|
-
}
|
|
97
|
-
newStatements.push(node);
|
|
98
|
-
});
|
|
99
|
-
statements = newStatements;
|
|
91
|
+
statements = (0, flattenStatementsWithComments_1.flattenStatementsWithComments)(statements);
|
|
100
92
|
const body = statements.map((node) => transformNodeFunction(node, {
|
|
101
93
|
...options,
|
|
102
94
|
logic,
|
|
@@ -431,6 +423,9 @@ function transformConditionalExpression(node, options) {
|
|
|
431
423
|
});
|
|
432
424
|
}
|
|
433
425
|
function transformArrayExpression(node, options) {
|
|
426
|
+
if (options?.inCallQueryComponentField) {
|
|
427
|
+
return (0, utils_1.throwError)(options, '数据查询中不支持使用 NewList(直接声明数组)，请将对应操作放在数据查询外部进行处理', node);
|
|
428
|
+
}
|
|
434
429
|
let typeAnnotation = options.typeAnnotation;
|
|
435
430
|
delete options.typeAnnotation;
|
|
436
431
|
const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
|
|
@@ -440,6 +435,9 @@ function transformArrayExpression(node, options) {
|
|
|
440
435
|
});
|
|
441
436
|
}
|
|
442
437
|
function transform2NewAnonymousStructure(node, options) {
|
|
438
|
+
if (options?.inCallQueryComponentField) {
|
|
439
|
+
return (0, utils_1.throwError)(options, '数据查询中不支持使用 NewComposite(直接声明匿名结构)，请将对应操作放在数据查询外部进行处理', node);
|
|
440
|
+
}
|
|
443
441
|
for (let i = 0; i < node.properties.length; i++) {
|
|
444
442
|
const item = node.properties[i];
|
|
445
443
|
const itemValue = item?.value;
|
|
@@ -462,7 +460,7 @@ function transform2NewAnonymousStructure(node, options) {
|
|
|
462
460
|
const structureProperties = [];
|
|
463
461
|
newProperties.forEach((arg, index) => {
|
|
464
462
|
structureProperties.push(new utils_1.naslTypes.StructureProperty({
|
|
465
|
-
name: arg.key.name,
|
|
463
|
+
name: arg.key.name ?? arg.key.value,
|
|
466
464
|
typeAnnotation: arg.naslType || null,
|
|
467
465
|
}));
|
|
468
466
|
});
|
|
@@ -478,6 +476,9 @@ function transform2NewStructure(namespaceAndName, objectExpression, options) {
|
|
|
478
476
|
return newComposite;
|
|
479
477
|
}
|
|
480
478
|
function transform2NewExpression(calleeName, node, options) {
|
|
479
|
+
if (options?.inCallQueryComponentField) {
|
|
480
|
+
return (0, utils_1.throwError)(options, `数据查询中不支持使用 ${calleeName}，请将对应操作放在数据查询外部进行处理`, node);
|
|
481
|
+
}
|
|
481
482
|
const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
|
|
482
483
|
if (calleeName === 'NewList') {
|
|
483
484
|
let typeAnnotation;
|
|
@@ -592,6 +593,7 @@ function transform2ArrayPattern(decl, options) {
|
|
|
592
593
|
if (element.type === 'Identifier') {
|
|
593
594
|
const varTypeAnnotation = element.typeAnnotation?.typeAnnotation;
|
|
594
595
|
if (options.transformType === 'logic') {
|
|
596
|
+
(0, checkIdentifierName_1.checkIdentifierName)(element.name, '变量', options, element);
|
|
595
597
|
options.logic.variables.push(new utils_1.naslTypes.Variable({
|
|
596
598
|
name: element.name,
|
|
597
599
|
typeAnnotation: varTypeAnnotation && (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(varTypeAnnotation, options) || undefined,
|
|
@@ -636,6 +638,7 @@ function transform2VariableAndAddAssignment(node, options) {
|
|
|
636
638
|
}
|
|
637
639
|
let typeAnnotation;
|
|
638
640
|
if (options.transformType === 'logic' && ![...options.logic.variables, ...options.logic.returns].some((variable) => variable.name === variableName)) {
|
|
641
|
+
(0, checkIdentifierName_1.checkIdentifierName)(variableName, '变量', options, decl.id);
|
|
639
642
|
const varTypeAnnotation = decl.id.typeAnnotation?.typeAnnotation;
|
|
640
643
|
typeAnnotation = varTypeAnnotation && (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(varTypeAnnotation, options) || undefined;
|
|
641
644
|
const variable = new utils_1.naslTypes.Variable({
|
|
@@ -680,15 +683,7 @@ function flatCommentWithNode(node) {
|
|
|
680
683
|
newNodeList = [...node?.innerComments];
|
|
681
684
|
}
|
|
682
685
|
if (node?.body?.length) {
|
|
683
|
-
|
|
684
|
-
if (item?.leadingComments?.length) {
|
|
685
|
-
newNodeList.push(...item?.leadingComments);
|
|
686
|
-
}
|
|
687
|
-
if (item?.trailingComments?.length && index === node?.body.length - 1) {
|
|
688
|
-
newNodeList.push(...item?.trailingComments);
|
|
689
|
-
}
|
|
690
|
-
newNodeList.push(item);
|
|
691
|
-
});
|
|
686
|
+
newNodeList.push(...(0, flattenStatementsWithComments_1.flattenStatementsWithComments)(node.body));
|
|
692
687
|
}
|
|
693
688
|
return newNodeList;
|
|
694
689
|
}
|
|
@@ -1005,16 +1000,24 @@ function transform2StringInterpolation(node, options) {
|
|
|
1005
1000
|
});
|
|
1006
1001
|
}
|
|
1007
1002
|
exports.transform2StringInterpolation = transform2StringInterpolation;
|
|
1003
|
+
function transformRequire2JSBlock(node, calleeName, callee, options) {
|
|
1004
|
+
const arg0 = node.arguments[0].value;
|
|
1005
|
+
const filename = arg0.replace('./tmp/', '');
|
|
1006
|
+
return new utils_1.naslTypes.JSBlock({ code: options.externalFiles?.get(filename) ?? '' });
|
|
1007
|
+
}
|
|
1008
1008
|
function transform2Comment(node, options) {
|
|
1009
1009
|
if (node.type === 'EmptyStatement') {
|
|
1010
1010
|
if (node?.leadingComments) {
|
|
1011
|
-
|
|
1011
|
+
// trim() 防止 Babel 解析 /* ... */ 时将内侧空格存入 value，
|
|
1012
|
+
// 导致每次 files2nasl → nasl2files 轮回后注释空格累积 +1
|
|
1013
|
+
const newValue = node?.leadingComments?.[0]?.value?.trim().replace(/\n/g, '<br>');
|
|
1012
1014
|
return new utils_1.naslTypes.Comment({
|
|
1013
1015
|
value: String(newValue),
|
|
1014
1016
|
});
|
|
1015
1017
|
}
|
|
1016
1018
|
}
|
|
1017
|
-
|
|
1019
|
+
// trim() 同上，防止空格在每次 prepare-src 轮回中递增
|
|
1020
|
+
const newValue = node?.value?.trim().replace(/\n/g, '<br>');
|
|
1018
1021
|
return new utils_1.naslTypes.Comment({
|
|
1019
1022
|
value: String(newValue || ''),
|
|
1020
1023
|
});
|
|
@@ -1037,7 +1040,16 @@ function transform2PartialNewComposite(node, options) {
|
|
|
1037
1040
|
const newProperties = (node?.properties || node?.arguments?.[0]?.properties);
|
|
1038
1041
|
let idx = 0;
|
|
1039
1042
|
newProperties?.forEach((arg, index) => {
|
|
1040
|
-
|
|
1043
|
+
// StringLiteral 类型的键（如 JSON 格式的 "name"）统一转换为 Identifier 处理，并校验命名规则
|
|
1044
|
+
let keyNode;
|
|
1045
|
+
if (arg.key?.type === 'StringLiteral') {
|
|
1046
|
+
(0, checkIdentifierName_1.checkIdentifierName)(arg.key.value, '属性', options, arg.key);
|
|
1047
|
+
keyNode = utils_1.babelTypes.identifier(arg.key.value);
|
|
1048
|
+
}
|
|
1049
|
+
else {
|
|
1050
|
+
keyNode = arg.key;
|
|
1051
|
+
}
|
|
1052
|
+
properties.push(transformNodeFunction(keyNode, options));
|
|
1041
1053
|
const calleeName = (0, utils_1.generate)(arg.value).code;
|
|
1042
1054
|
let sliceMembers = false;
|
|
1043
1055
|
if (arg.value.type === 'MemberExpression') {
|
|
@@ -1103,7 +1115,7 @@ function transform2PartialNewComposite(node, options) {
|
|
|
1103
1115
|
}
|
|
1104
1116
|
}
|
|
1105
1117
|
structureProperties.push(new utils_1.naslTypes.StructureProperty({
|
|
1106
|
-
name: arg?.key?.name,
|
|
1118
|
+
name: arg?.key?.name ?? arg?.key?.value,
|
|
1107
1119
|
typeAnnotation: null
|
|
1108
1120
|
}));
|
|
1109
1121
|
});
|
|
@@ -1148,6 +1160,9 @@ function transformNewExpression(node, options) {
|
|
|
1148
1160
|
return transform2NewRegex(node, options);
|
|
1149
1161
|
}
|
|
1150
1162
|
else if (calleeName.includes('.entities.') || calleeName.includes('.structures.')) {
|
|
1163
|
+
if (options?.inCallQueryComponentField) {
|
|
1164
|
+
return (0, utils_1.throwError)(options, `数据查询中不支持使用 new ${calleeName}，请将对应操作放在数据查询外部进行处理`, node);
|
|
1165
|
+
}
|
|
1151
1166
|
return transform2NewStructure(calleeName, node.arguments[0], options);
|
|
1152
1167
|
}
|
|
1153
1168
|
return (0, utils_1.throwError)(options, '在新建表达式中不支持节点类型', node.type, node);
|
|
@@ -1258,6 +1273,14 @@ function transformMemberExpression(node, options) {
|
|
|
1258
1273
|
return newNode;
|
|
1259
1274
|
}
|
|
1260
1275
|
}
|
|
1276
|
+
const configPropertyRegex = /^(app|extensions\.\w+)\.configuration\.(?:groups\.)?(\w+)\.(?:properties\.)?(\w+)$/;
|
|
1277
|
+
if (configPropertyRegex.test(calleeName)) {
|
|
1278
|
+
const [, prefix, groupName, propName] = calleeName.match(configPropertyRegex);
|
|
1279
|
+
return new utils_1.naslTypes.Identifier({
|
|
1280
|
+
namespace: `${prefix}.configuration.groups.${groupName}.properties`,
|
|
1281
|
+
name: propName,
|
|
1282
|
+
});
|
|
1283
|
+
}
|
|
1261
1284
|
if (node.property.type === 'NumericLiteral' || node?.property?.type === 'BinaryExpression') {
|
|
1262
1285
|
return new utils_1.naslTypes.CallFunction({
|
|
1263
1286
|
calleeNamespace: 'nasl.util',
|
|
@@ -1680,11 +1703,6 @@ function transform2CallFunction(node, calleeName, argument, options) {
|
|
|
1680
1703
|
});
|
|
1681
1704
|
}
|
|
1682
1705
|
}
|
|
1683
|
-
if (calleeName === 'Convert' && !newTypeArguments) {
|
|
1684
|
-
newTypeArguments = [
|
|
1685
|
-
new utils_1.naslTypes.TypeAnnotation()
|
|
1686
|
-
];
|
|
1687
|
-
}
|
|
1688
1706
|
if (calleeName === 'FromString') {
|
|
1689
1707
|
if (newTypeArguments?.[0]?.typeName === 'Time' && newArguments?.[0]?.expression?.concept === 'StringLiteral') {
|
|
1690
1708
|
const timeValue = newArguments?.[0]?.expression?.value;
|
|
@@ -1859,8 +1877,15 @@ function transformCall2CallFunction(node, calleeName, callee, options) {
|
|
|
1859
1877
|
return transform2CallFunction(node, curCalleeName, argument, options);
|
|
1860
1878
|
}
|
|
1861
1879
|
exports.transformCall2CallFunction = transformCall2CallFunction;
|
|
1880
|
+
const SUPPORTED_NASL_UI_FUNCTIONS = ['showMessage', 'destination', 'gotoLink'];
|
|
1862
1881
|
function transform2UIFunction(node, calleeName, callee, options) {
|
|
1863
|
-
|
|
1882
|
+
const uiFunctionName = callee[2].name;
|
|
1883
|
+
if (!SUPPORTED_NASL_UI_FUNCTIONS.includes(uiFunctionName)) {
|
|
1884
|
+
return (0, utils_1.throwError)(options, `nasl.ui 仅支持 ${SUPPORTED_NASL_UI_FUNCTIONS.map((f) => `nasl.ui.${f}`).join('、')}，不支持 nasl.ui.${uiFunctionName}`, node);
|
|
1885
|
+
}
|
|
1886
|
+
if (uiFunctionName === 'destination') {
|
|
1887
|
+
if (!node.arguments[0])
|
|
1888
|
+
return (0, utils_1.throwError)(options, 'nasl.ui.destination 缺少目标页面参数', node);
|
|
1864
1889
|
let namespaceNode = node.arguments[0];
|
|
1865
1890
|
let namespace = '';
|
|
1866
1891
|
if (namespaceNode.type === 'TemplateLiteral') {
|
|
@@ -1906,7 +1931,9 @@ function transform2UIFunction(node, calleeName, callee, options) {
|
|
|
1906
1931
|
arguments: argument,
|
|
1907
1932
|
});
|
|
1908
1933
|
}
|
|
1909
|
-
if (
|
|
1934
|
+
if (uiFunctionName === 'gotoLink') {
|
|
1935
|
+
if (!node.arguments[0])
|
|
1936
|
+
return (0, utils_1.throwError)(options, 'nasl.ui.gotoLink 缺少链接参数', node);
|
|
1910
1937
|
return new utils_1.naslTypes.ExternalDestination({
|
|
1911
1938
|
link: fixExpression(node?.arguments[0], options),
|
|
1912
1939
|
});
|
|
@@ -1918,7 +1945,7 @@ function transform2UIFunction(node, calleeName, callee, options) {
|
|
|
1918
1945
|
// }
|
|
1919
1946
|
return new utils_1.naslTypes.CallLogic({
|
|
1920
1947
|
calleeNamespace: 'nasl.ui',
|
|
1921
|
-
calleeName:
|
|
1948
|
+
calleeName: uiFunctionName,
|
|
1922
1949
|
shortcut: true,
|
|
1923
1950
|
/**
|
|
1924
1951
|
* 这个函数是修复 AI 翻译出错的情况，与正常的 transform 做个区分
|
|
@@ -2177,6 +2204,30 @@ function transformCall2LogicWithAuth(node, calleeName, callee, options) {
|
|
|
2177
2204
|
});
|
|
2178
2205
|
}
|
|
2179
2206
|
exports.transformCall2LogicWithAuth = transformCall2LogicWithAuth;
|
|
2207
|
+
function transformCall2GetCustomConfig(node, calleeName, callee, options) {
|
|
2208
|
+
const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
|
|
2209
|
+
const arg = node.arguments?.[0];
|
|
2210
|
+
if (!arg || arg.type !== 'MemberExpression') {
|
|
2211
|
+
return (0, utils_1.throwError)(options, 'nasl.configuration.getCustomConfig 的参数必须是 {app|extensions.xxx}.configuration.{group}.{name} 形式的成员访问', node);
|
|
2212
|
+
}
|
|
2213
|
+
const flatCallee = flatMemberExpression(arg);
|
|
2214
|
+
const argName = flatCallee.map((n) => n.name).join('.');
|
|
2215
|
+
const configPropertyRegex = /^(app|extensions\.\w+)\.configuration\.(\w+)\.(\w+)$/;
|
|
2216
|
+
if (!configPropertyRegex.test(argName)) {
|
|
2217
|
+
return (0, utils_1.throwError)(options, `nasl.configuration.getCustomConfig 参数路径格式不正确，期望 {app|extensions.xxx}.configuration.{group}.{name}，实际为 ${argName}`, node);
|
|
2218
|
+
}
|
|
2219
|
+
return new utils_1.naslTypes.CallLogic({
|
|
2220
|
+
calleeNamespace: 'nasl.configuration',
|
|
2221
|
+
calleeName: 'getCustomConfig',
|
|
2222
|
+
arguments: [
|
|
2223
|
+
new utils_1.naslTypes.Argument({
|
|
2224
|
+
keyword: 'name',
|
|
2225
|
+
expression: transformNodeFunction(arg, options),
|
|
2226
|
+
}),
|
|
2227
|
+
],
|
|
2228
|
+
});
|
|
2229
|
+
}
|
|
2230
|
+
exports.transformCall2GetCustomConfig = transformCall2GetCustomConfig;
|
|
2180
2231
|
function transformCall2Paginate(node, calleeName, callee, options) {
|
|
2181
2232
|
const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
|
|
2182
2233
|
const newCallee = node.arguments || [];
|
|
@@ -2654,10 +2705,12 @@ function transform2LogicItem(node, options) {
|
|
|
2654
2705
|
});
|
|
2655
2706
|
transformManager.register('MemberExpression', transformMemberExpression);
|
|
2656
2707
|
transformManager.register('OptionalMemberExpression', transformMemberExpression);
|
|
2708
|
+
transformManager.registerCallExpression((node, calleeName) => calleeName === 'require' && node.arguments[0]?.value?.startsWith('./tmp/'), transformRequire2JSBlock);
|
|
2657
2709
|
transformManager.registerCallExpression((node, calleeName, callee) => callee.length === 1 && (node.callee.type === 'FunctionExpression' && node.callee.id?.name === 'match' || node.callee.type === 'ArrowFunctionExpression'), transformCallFunctionExpression2Match);
|
|
2658
2710
|
transformManager.registerCallExpression((node, calleeName) => /^\$refs\./.test(calleeName), transformCall2CallViewElementLogic);
|
|
2659
2711
|
transformManager.registerCallExpression((node, calleeName, callee) => callee.length === 2 && callee[0].type === 'Identifier' && callee[0].name.endsWith('Entity'), transformCall2CallEntityLogic);
|
|
2660
2712
|
transformManager.registerCallExpression('nasl.oql.query', transformCall2OQLQuery);
|
|
2713
|
+
transformManager.registerCallExpression('nasl.configuration.getCustomConfig', transformCall2GetCustomConfig);
|
|
2661
2714
|
transformManager.registerCallExpression('nasl.util.consoleLog', transformCall2ConsoleLog);
|
|
2662
2715
|
transformManager.registerCallExpression('console.log', transformCall2ConsoleLog);
|
|
2663
2716
|
transformManager.registerCallExpression((node, calleeName) => calleeName.startsWith('nasl.logging.'), transformCall2Logging);
|