@lcap/nasl 3.13.2-beta.3 → 3.13.2-beta.4
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/transforms/transform2LogicItem.js +3 -3
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/server/OQL/oql-cache.d.ts.map +1 -1
- package/out/server/OQL/oql-cache.js +13 -9
- package/out/server/OQL/oql-cache.js.map +1 -1
- package/out/server/checker/identifier.d.ts +6 -0
- package/out/server/checker/identifier.d.ts.map +1 -1
- package/out/server/checker/identifier.js +68 -16
- package/out/server/checker/identifier.js.map +1 -1
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +5 -10
- package/out/server/naslServer.js.map +1 -1
- package/out/service/storage/init.d.ts.map +1 -1
- package/out/service/storage/init.js +7 -5
- package/out/service/storage/init.js.map +1 -1
- package/package.json +12 -12
|
@@ -1,7 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.check = void 0;
|
|
3
|
+
exports.check = exports.isEnumIdentifier = void 0;
|
|
4
4
|
const asserts_1 = require("@lcap/nasl-concepts/asserts");
|
|
5
|
+
/**
|
|
6
|
+
* 枚举标识符
|
|
7
|
+
*
|
|
8
|
+
* @description 指向枚举本身的标志符
|
|
9
|
+
*/
|
|
10
|
+
function isEnumIdentifier(node) {
|
|
11
|
+
if (!(0, asserts_1.isStrictIdentifier)(node)) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
14
|
+
const typeNode = node.__TypeAnnotation ?? node.typeAnnotation;
|
|
15
|
+
// 枚举类型
|
|
16
|
+
if (!typeNode || typeNode.typeKind !== 'reference' || typeNode.typeNamespace !== 'app.enums') {
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
const { app } = node;
|
|
20
|
+
// 指向枚举本身
|
|
21
|
+
return node.namespace === 'app.enums' && app.enums.some((item) => item.name === node.name);
|
|
22
|
+
}
|
|
23
|
+
exports.isEnumIdentifier = isEnumIdentifier;
|
|
5
24
|
/**
|
|
6
25
|
* 必须在 MemberExpression 表达式中的标识符
|
|
7
26
|
*
|
|
@@ -9,24 +28,56 @@ const asserts_1 = require("@lcap/nasl-concepts/asserts");
|
|
|
9
28
|
*/
|
|
10
29
|
function mustInMemberExpression(node) {
|
|
11
30
|
const diagnostics = [];
|
|
12
|
-
const typeNode = node.__TypeAnnotation ?? node.typeAnnotation;
|
|
13
31
|
// 枚举类型
|
|
14
|
-
if (!
|
|
32
|
+
if (!isEnumIdentifier(node)) {
|
|
15
33
|
return [];
|
|
16
34
|
}
|
|
17
|
-
|
|
18
|
-
//
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
node.
|
|
28
|
-
|
|
29
|
-
|
|
35
|
+
if (
|
|
36
|
+
// 不满足条件时判定为错误
|
|
37
|
+
!(
|
|
38
|
+
// 在 MemberExpression 表达式中，并且还是 object 属性
|
|
39
|
+
(node.parentKey === 'object' && (0, asserts_1.isStrictMemberExpression)(node.parentNode)) ||
|
|
40
|
+
// 在 SelectMembers 表达式中，并且还是 expression 属性
|
|
41
|
+
(node.parentKey === 'expression' && (0, asserts_1.isStrictSelectMembers)(node.parentNode)))) {
|
|
42
|
+
const errorDetail = {
|
|
43
|
+
node,
|
|
44
|
+
severity: 'error',
|
|
45
|
+
message: `${node.name} 是类型不是合法变量，不允许在这里使用`,
|
|
46
|
+
};
|
|
47
|
+
node.tsErrorDetail = errorDetail;
|
|
48
|
+
diagnostics.push(errorDetail);
|
|
49
|
+
}
|
|
50
|
+
return diagnostics;
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* 不允许被批量赋值直接连接
|
|
54
|
+
*/
|
|
55
|
+
function cannotBeLined(node) {
|
|
56
|
+
const diagnostics = [];
|
|
57
|
+
const { parentNode: selectMember, parentKey: key } = node;
|
|
58
|
+
if (!isEnumIdentifier(node) || !(0, asserts_1.isStrictSelectMembers)(selectMember) || key !== 'expression') {
|
|
59
|
+
return diagnostics;
|
|
60
|
+
}
|
|
61
|
+
const batchAssignment = selectMember.getAncestor('BatchAssignment');
|
|
62
|
+
const index = batchAssignment?.rights?.indexOf?.(selectMember) ?? -1;
|
|
63
|
+
// 没有找到右侧待赋值元素
|
|
64
|
+
if (index === -1) {
|
|
65
|
+
return diagnostics;
|
|
66
|
+
}
|
|
67
|
+
const isLined = batchAssignment.assignmentLines.some(({ rightIndex }) => {
|
|
68
|
+
// 指向了此项本身
|
|
69
|
+
return (rightIndex.length === 1 &&
|
|
70
|
+
rightIndex[0] === index);
|
|
71
|
+
});
|
|
72
|
+
// 确实被连线
|
|
73
|
+
if (isLined) {
|
|
74
|
+
const errorDetail = {
|
|
75
|
+
node,
|
|
76
|
+
severity: 'error',
|
|
77
|
+
message: `${node.name} 是类型，不允许连线`,
|
|
78
|
+
};
|
|
79
|
+
node.tsErrorDetail = errorDetail;
|
|
80
|
+
diagnostics.push(errorDetail);
|
|
30
81
|
}
|
|
31
82
|
return diagnostics;
|
|
32
83
|
}
|
|
@@ -37,6 +88,7 @@ function check(node) {
|
|
|
37
88
|
}
|
|
38
89
|
return [
|
|
39
90
|
...mustInMemberExpression(node),
|
|
91
|
+
...cannotBeLined(node),
|
|
40
92
|
];
|
|
41
93
|
}
|
|
42
94
|
exports.check = check;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identifier.js","sourceRoot":"","sources":["../../../src/server/checker/identifier.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"identifier.js","sourceRoot":"","sources":["../../../src/server/checker/identifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"naslServer.d.ts","sourceRoot":"","sources":["../../src/server/naslServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"naslServer.d.ts","sourceRoot":"","sources":["../../src/server/naslServer.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI3C,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAO1C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,OAAO,EACL,MAAM,EACN,QAAQ,EACR,GAAG,EAEH,KAAK,EAEL,cAAc,EAed,KAAK,EAIL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,aAAa,EAKb,aAAa,EAkCb,SAAS,EAET,UAAU,EAmBV,UAAU,EAGV,YAAY,EAIZ,yBAAyB,EAI1B,MAAM,aAAa,CAAC;AA4BrB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAwD,QAAQ,EAAoB,MAAM,cAAc,CAAC;AAEhH,OAAO,EAAoB,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAIxF,KAAK,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;AAC9C,KAAK,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC5C,KAAK,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AAChD,KAAK,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAC;AAEjD,KAAK,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AACrD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAsCnD,UAAU,cAAe,SAAQ,QAAQ;IACvC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAGD,KAAK,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAC/E,KAAK,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;AAC3C,KAAK,YAAY,GAAG,GAAG,CAAC,QAAQ,EAAE,cAAc,GAAG;IAAE,cAAc,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,CAAC,CAAC;AAsKpG,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,YAiC1D;AAkCD,cACM,UAAU;IACd,qBAAqB;IACrB,sBAAsB,0CAA4B;IAElD,QAAQ,EAAE,QAAQ,CAAC;IAEnB,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;;;OAIG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAA+B;IAElE,eAAe;IACf,OAAO,sBAA6B;IAGpC;;OAEG;IACH,iBAAiB,UAAQ;IAGzB,aAAa,EAAE;QAAE,CAAC,gBAAgB,EAAE,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;KAAE,CAAM;IAGjE,iBAAiB,EAAE,iBAAiB,CAAC;IAErC,iBAAiB,EAAE,YAAY,CAAC;IAGhC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAM;IAErD,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAE1B,mBAAmB,EAAE,OAAO,CAAC;IAG7B,WAAW,EAAE,OAAO,CAAC;IAErB,IAAI,EAAE,aAAa,CAAC;IAEpB,MAAM,EAAE,MAAM,CAAC;IAER,aAAa,EAAE,OAAO,CAAQ;IAE9B,OAAO,EAAE,YAAY,CAAC;IAE7B,OAAO,CAAC,OAAO,CAAM;IAErB;;;;OAIG;IACH,gBAAgB,EAAE,OAAO,CAAC;gBAEd,GAAG,EAAE,iBAAiB;IAI5B,KAAK;IAKX,SAAS;IAKH,MAAM,CAAC,GAAG,EAAE,iBAAiB;IA6I7B,UAAU,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE;QACzC,aAAa,EAAE,MAAM,CAAC;QACtB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAC1C;IAgGD,OAAO,CAAE,aAAa;IAiKtB,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;IAChB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAU1C,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM;IAiBpD,eAAe,CAAC,MAAM,EAAE,MAAM;IAS9B,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM;IAkBpD,0BAA0B,EAAE,gBAAgB,EAAE,CAAM;IAC9C,gCAAgC,CAAC,GAAG,EAAE,GAAG;IAS/C,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAKtC,iBAAiB,CAAC,GAAG,EAAE,GAAG;IAGpB,uBAAuB,CAAC,GAAG,EAAE,GAAG;IAyBtC,4BAA4B;IAG5B,mBAAmB,CAAC,GAAG,EAAE,GAAG;IAItB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,UAAQ,EAAE,mBAAmB,UAAO;IA0GjE,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,OAAO;IAmBhD;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,eAAe,EAAE,EAAE,KAAa,EAAE;;KAAK;IAMhE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,eAAe;IAI7C;;;OAGG;IACH,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC;IAKnD;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE;QAAE,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;KAAE;IAKpE;;OAEG;IACH,oBAAoB,CAAC,IAAI,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE;IAQ9C,4BAA4B,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC;IAIrE,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC;IA6CjF,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC;IAQtF,IAAI;IAIJ,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,qBAAqB;IAIjD,cAAc,CAAC,QAAQ,EAAE,MAAM;IAIzB,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,uBAAuB;IAIzD,wBAAwB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;IAmBpF,yBAAyB,CAAC,IAAI,EAAE,GAAG;IAInC;;;;OAIG;IACG,kBAAkB,CAAC,IAAI,EAAE,QAAQ;;;;IA+CjC,sCAAsC,CAAC,IAAI,EAAE,WAAW;IAyD9D;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,GAAG;0BACgE,OAAO;kBAAY,WAAW,qBAAqB;;IAG9I,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;0BAEZ,OAAO;kBACf,MAAM,WAAW,qBAAqB,CAAC;;IAIrD;;;;;OAKG;IACG,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;;;;IAK/C,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;0BAC6D,OAAO;kBAAY,WAAW,qBAAqB;;IAG7I,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;0BAC6D,OAAO;kBAAY,WAAW,qBAAqB;;IAGxI,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;;;;IAKpC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;;;;IAK3C;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;IAiBpE,wBAAwB,CAAC,IAAI,EAAE,GAAG;IAIlC,8BAA8B,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;IAQxD;;OAEG;IACH,yBAAyB,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,UAAU;IAKnE,OAAO,CAAE,sCAAsC;IAqO/C;;;;OAIG;IAEH,OAAO,CAAC,yBAAyB;IAIjC;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK;IASxB,cAAc,CAAC,IAAI,EAAE,QAAQ;IAM7B;;;;OAIG;IACH,OAAO,CAAE,yCAAyC;IAqTlD,oCAAoC;IACpC,iCAAiC,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;QAC7D,gBAAgB,EAAE,OAAO,CAAC;QAC1B,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IA6CF;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE;;;;IAwBlD,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,MAAM;IAchH;;;;OAIG;IACH,OAAO,CAAE,+BAA+B;IAmtCxC,YAAY,CAAC,WAAW,EAAE,UAAU,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE;IA0B9F,0BAA0B,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC;IA0BrF,oBAAoB,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC;IAmBzE,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,GAAG;IAmUhE,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO;IAQ5C;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,aAAa;IAM3B,OAAO,CAAE,iBAAiB;IAwD1B;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IA2ChC;;;;KAIC;IAED,iBAAiB,CACf,UAAU,EAAE,UAAU,CAAC,sBAAsB,GAAG,UAAU,CAAC,sBAAsB,EACjF,QAAQ,EAAE,QAAQ,GACjB,QAAQ;IA6EX,aAAa,CACX,UAAU,EAAE,UAAU,CAAC,sBAAsB,GAAG,UAAU,CAAC,sBAAsB,EACjF,QAAQ,EAAE,QAAQ,GACjB,QAAQ;IA2EX;;;;OAIG;IACG,UAAU,CAAC,IAAI,EAAE,QAAQ;IA2Y/B;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM;IAygBhE,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK;IA2B7C,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO;IA0B9D,cAAc,CAAC,IAAI,EAAE,QAAQ;IA2C7B,gBAAgB,CAAC,IAAI,EAAE,QAAQ;IA4BrC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC;IA6DrI,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAU5D;;;;;OAKG;IACH,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAyBnD;;;;;OAKG;IACH,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAQ7E;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;IA2C/B,8BAA8B,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ;IAU3E,2BAA2B,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM;IA2B7D,wBAAwB,CAAC,IAAI,EAAE,QAAQ;IAoBvC,4BAA4B,CAAC,IAAI,EAAE,GAAG;IAItC;;;;;;OAMG;IACG,+BAA+B,CAAC,kBAAkB,EAAE,MAAM;IAiBhE;;;;;OAKG;IACG,oBAAoB,CAAC,KAAK,EAAE,KAAK;IAavC;;;OAGG;IACH,iCAAiC,CAAC,KAAK,EAAE,QAAQ;IA8DjD;;;;OAIG;IACH,OAAO,CAAE,sCAAsC;IAkP/C,OAAO,CAAE,2CAA2C;IAkDpD;;OAEG;IACH,wBAAwB,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE,OAAO;IAMxD,oBAAoB,CAAC,QAAQ,EAAE,GAAG,GAAG,KAAK,GAAG,yBAAyB,EAAE,WAAW,EAAE,OAAO;IA8D5F,wBAAwB,CAAC,QAAQ,EAAE,GAAG,GAAG,KAAK,GAAG,yBAAyB;IAoRhF;;;;;OAKG;IACH,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE;IAwBvC,OAAO,CAAE,uCAAuC;IAgChD,gBAAgB,CACd,QAAQ,EAAE,GAAG,CACX,QAAQ,EACN,cAAc,GACd;QACA,cAAc,EAAE,cAAc,CAAC;QAC/B,MAAM,EAAE,GAAG,CAAC;KACb,CACF,EACD,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;IAoO7B;;;;OAIG;IACF,sCAAsC,CACrC,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,GACnC,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC;IAsClC,wBAAwB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,GAAE,MAAY;IAsD9D,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC;IAa1C,oBAAoB,CAAC,IAAI,EAAE,aAAa;;;;IA+B9C,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;0BAC6D,OAAO;kBAAY,WAAW,qBAAqB;;IAG1I,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;;;;IAI7C;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM;IA4BvE;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE;QACxF,GAAG,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAA;KAC1B;IA8CD;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM;IA4C/F;;;;OAIG;IACG,qBAAqB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ;IAcjE;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM;IA0FrG;;;;OAIG;IACG,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAuCtD;;;;;;;;OAQG;IACG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,MAAM;IAwG3F,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,YAAY;IA6JzD,cAAc;IAwBd;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,UAAU,GAAG,SAAS;IAcxD,OAAO,CAAC,WAAW;IAInB,mCAAmC,CAAC,IAAI,EAAE,UAAU;IAMpD,0BAA0B;IACpB,yBAAyB,CAAC,GAAG,EAAE,GAAG;IAYxC,0BAA0B;IACpB,wBAAwB,CAAC,GAAG,EAAE,GAAG;IAiBvC,KAAK,CAAC,CAAC,SAAS,QAAQ,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC;CAIpC;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}
|
package/out/server/naslServer.js
CHANGED
|
@@ -585,7 +585,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
585
585
|
const { structures = [], metadataTypes = [], frontendTypes = [], interfaces = [], enums = [], logics = [], authLogics = [], authLogicsForCallInterface = [], processes = [], processV2s = [], dataSources = [], triggerLaunchers = [], connections = [], roles = [], overriddenLogics = [], backend, configuration, preferenceMap = {}, } = module;
|
|
586
586
|
const { namespaces = [], triggers = [], dependencies = [] } = module;
|
|
587
587
|
const { frontends = [] } = module;
|
|
588
|
-
const oqlFinished = this.waitOqlQueryComponentChildrenFinish(module);
|
|
589
588
|
yield* getTsFiles(structures, 'structure');
|
|
590
589
|
// 启用元数据时才翻译
|
|
591
590
|
if ((module.concept === 'App' && String(preferenceMap.metadataTypeEnable) === 'true') ||
|
|
@@ -621,7 +620,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
621
620
|
yield* getTsFiles(concat(dataSources, 'entities'), 'dataSource_entity');
|
|
622
621
|
yield* getTsFiles(interfaces, 'interface');
|
|
623
622
|
yield* getTsFiles(enums, 'enum');
|
|
624
|
-
yield oqlFinished;
|
|
625
623
|
yield* getTsFiles(logics, 'logic');
|
|
626
624
|
yield* getTsFiles(authLogics, 'authLogic', concepts_1.Logic);
|
|
627
625
|
yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface', concepts_1.Logic);
|
|
@@ -785,6 +783,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
785
783
|
catch (err) {
|
|
786
784
|
this.logger.error('请求sql函数列表失败', err);
|
|
787
785
|
}
|
|
786
|
+
// 等待 sql 查询
|
|
787
|
+
await this.waitOqlQueryComponentChildrenFinish(app);
|
|
788
|
+
// 翻译 ts 文件
|
|
788
789
|
const results = await utils.runGeneratorAsync(getAllTsFiles());
|
|
789
790
|
const files = results.map((result) => ({
|
|
790
791
|
file: result.filePath,
|
|
@@ -6598,14 +6599,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
6598
6599
|
return (this.tsFiles.get(fileNode.getEmbeddedFilePath()) ?? '').slice(range.start.offset, range.end.offset);
|
|
6599
6600
|
}
|
|
6600
6601
|
waitOqlQueryComponentChildrenFinish(node) {
|
|
6601
|
-
|
|
6602
|
-
|
|
6603
|
-
*
|
|
6604
|
-
* @description Nodejs 环境下（generator-fe 环境）使用合并接口
|
|
6605
|
-
*/
|
|
6606
|
-
const isBatchTypeScriptQueryEnabled = utils.isNode;
|
|
6607
|
-
return (0, oql_cache_1.internalWaitOqlQueryComponentChildrenFinish)(node, {
|
|
6608
|
-
batchMode: isBatchTypeScriptQueryEnabled,
|
|
6602
|
+
return (0, oql_cache_1.internalWaitOqlQueryComponentChildrenFinish)(this.toRaw(node), {
|
|
6603
|
+
batchMode: true,
|
|
6609
6604
|
});
|
|
6610
6605
|
}
|
|
6611
6606
|
/** 关闭 metadataTypes 校验 */
|