@lcap/nasl 4.1.0-rc.8 → 4.1.0-rc.9
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/genBundleFiles.d.ts.map +1 -1
- package/out/generator/genBundleFiles.js +9 -6
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/release-body/body.d.ts.map +1 -1
- package/out/generator/release-body/body.js +2 -3
- package/out/generator/release-body/body.js.map +1 -1
- package/out/generator/release-body/data.d.ts.map +1 -1
- package/out/generator/release-body/data.js +0 -2
- package/out/generator/release-body/data.js.map +1 -1
- package/out/generator/release-body/utils.d.ts +4 -4
- package/out/generator/release-body/utils.d.ts.map +1 -1
- package/out/generator/release-body/utils.js +3 -3
- package/out/generator/release-body/utils.js.map +1 -1
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +35 -17
- package/out/server/naslServer.js.map +1 -1
- package/package.json +10 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"naslServer.d.ts","sourceRoot":"","sources":["../../src/server/naslServer.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAa,MAAM,kBAAkB,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAQ1C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,OAAO,EACL,MAAM,EACN,QAAQ,EACR,GAAG,EAEH,KAAK,EAEL,cAAc,EAed,KAAK,
|
|
1
|
+
{"version":3,"file":"naslServer.d.ts","sourceRoot":"","sources":["../../src/server/naslServer.ts"],"names":[],"mappings":"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"}
|
package/out/server/naslServer.js
CHANGED
|
@@ -46,6 +46,7 @@ const path = __importStar(require("path"));
|
|
|
46
46
|
const worker_threads_1 = require("worker_threads");
|
|
47
47
|
/// #endif
|
|
48
48
|
const concepts_1 = require("../concepts");
|
|
49
|
+
// import { validator, VusionValidator } from '@lcap/nasl-concepts';
|
|
49
50
|
const asserts_1 = require("@lcap/nasl-concepts/asserts");
|
|
50
51
|
const service_1 = require("@lcap/nasl-concepts/service");
|
|
51
52
|
const utils = __importStar(require("../utils"));
|
|
@@ -370,13 +371,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
370
371
|
const diagAppStartTime = performance.now();
|
|
371
372
|
await utils.runGeneratorAsync(this.semEnv.errorDiagnoser.diagnosticApp());
|
|
372
373
|
const diagAppEndTime = performance.now();
|
|
373
|
-
console.
|
|
374
|
+
console.info(`\x1b[44m\x1b[97m Diagnostic App \x1b[0m: ${((diagAppEndTime - diagAppStartTime) / 1000).toFixed(3)}s`);
|
|
374
375
|
const diagnosticMap = this.semEnv.errorDiagnoser.getAllDiagnostics();
|
|
375
376
|
const transformStartTime = performance.now();
|
|
376
377
|
const records = transformDiagnosticMapToRecords(diagnosticMap);
|
|
377
378
|
await this.diagnosticManager.setInitialDiagData(records);
|
|
378
379
|
const transformEndTime = performance.now();
|
|
379
|
-
console.
|
|
380
|
+
console.info(`\x1b[44m\x1b[97m Transform Diagnostic Map To Records \x1b[0m: ${((transformEndTime - transformStartTime) / 1000).toFixed(3)}s`);
|
|
380
381
|
// 首屏和增量通路不同，首屏时需要手动调用lsRunEndSwitch；增量时则在增量代码中调用
|
|
381
382
|
this._lsRunEndSwitch();
|
|
382
383
|
this.isFirstScreen = false;
|
|
@@ -1657,7 +1658,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
1657
1658
|
else if (nd.concept === 'Param' || nd.concept === 'ParamWithGroup') {
|
|
1658
1659
|
// 调用处的 keyword = XXX 等也要修改，所以查 Logic、View 等的引用
|
|
1659
1660
|
const pNode = NaslServer_1.toRaw(parentNode);
|
|
1660
|
-
if ((0,
|
|
1661
|
+
if ((0, service_1.isCallableNaslLogic)(pNode) || concepts_1.asserts.isStrictView(pNode)) {
|
|
1661
1662
|
const refs = semEnv.refMgr.getReferences(semEnv, pNode);
|
|
1662
1663
|
result.push(...wrapRefs(refs));
|
|
1663
1664
|
}
|
|
@@ -2148,7 +2149,16 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2148
2149
|
// 增加参数的副作用，用于更新logic和view
|
|
2149
2150
|
_addParamsEffect(refsList, nd) {
|
|
2150
2151
|
const parentNode = nd?.parentNode;
|
|
2151
|
-
|
|
2152
|
+
// 按 node.nodePath 降序排列，保证父级或更深层的引用先处理
|
|
2153
|
+
const sortedRefs = (refsList || []).slice().sort((a, b) => {
|
|
2154
|
+
const pa = a?.node?.nodePath ?? '';
|
|
2155
|
+
const pb = b?.node?.nodePath ?? '';
|
|
2156
|
+
return pb.localeCompare(pa);
|
|
2157
|
+
});
|
|
2158
|
+
// 考虑 CallA(CallA(null))
|
|
2159
|
+
// 如果 不按 nodePath 降序排列，那么更新了第一个 CallA 后，第二个的 CallA 的 nodePath 中会有 -1
|
|
2160
|
+
// 推测可能是 CallA 变成了新节点，所以存的 node 变了
|
|
2161
|
+
sortedRefs.forEach(({ node: minRangeNode }) => {
|
|
2152
2162
|
// 如果找到节点是callLogic就去更新
|
|
2153
2163
|
if (nd instanceof concepts_1.Param) {
|
|
2154
2164
|
if (minRangeNode instanceof concepts_1.CallLogic || minRangeNode instanceof concepts_1.CallAuthInterface) {
|
|
@@ -2701,14 +2711,16 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2701
2711
|
// 集成内存优化：在标注过程中直接优化JSON，减少内存使用和处理时间
|
|
2702
2712
|
(0, memory_optimization_1.optimizeJsonDuringAnnotation)(newJson);
|
|
2703
2713
|
let tyAnn = tyAnnToJSON(this.semEnv.getType(oldNd));
|
|
2704
|
-
if ((oldNd.concept === 'Variable' || oldNd.concept === 'Return' || oldNd.concept === 'Param')
|
|
2714
|
+
if ((oldNd.concept === 'Variable' || oldNd.concept === 'Return' || oldNd.concept === 'Param' || oldNd.concept === 'ParamWithGroup')
|
|
2705
2715
|
&& !oldNd.typeAnnotation
|
|
2706
2716
|
&& tyAnn?.typeKind !== 'typeParam') {
|
|
2707
2717
|
newJson.typeAnnotation = tyAnn;
|
|
2708
2718
|
}
|
|
2709
2719
|
// 原来的标注环节复制粘贴过来改写的，调整了顺序
|
|
2710
2720
|
// jsonSerializer 是 CallLogic，其余是 CallFunction。CallLogic 有好几个子类。
|
|
2711
|
-
|
|
2721
|
+
const isCallType1 = oldNd.concept === 'CallLogic' || oldNd.concept === 'CallConnector';
|
|
2722
|
+
const isCallFn = oldNd.concept === 'CallFunction';
|
|
2723
|
+
if (isCallType1 || isCallFn) {
|
|
2712
2724
|
const tzArgIdx = timeZoneArgumentIndexMap.get(oldNd.calleeName);
|
|
2713
2725
|
const args = oldNd.arguments;
|
|
2714
2726
|
const tzArg = args ? args[tzArgIdx] : undefined;
|
|
@@ -2721,9 +2733,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2721
2733
|
/**
|
|
2722
2734
|
* 特殊处理，不想去查两次类型, 因为是从函数签名上拿类型，所以直接合并在一起，先这样
|
|
2723
2735
|
* 应该主要是 Java 扩展库逻辑调用
|
|
2724
|
-
*/
|
|
2725
|
-
if (oldNd
|
|
2726
|
-
newJson.typeArguments = oldNd.__TypeArguments.map(tyAnnToJSON);
|
|
2736
|
+
*/ // @ts-ignore
|
|
2737
|
+
if (oldNd.__TypeArguments?.length && isCallType1) { // @ts-ignore
|
|
2738
|
+
newJson.typeArguments = oldNd.__TypeArguments.map(tyAnnToJSON);
|
|
2727
2739
|
newJson.typeAnnotation = tyAnn;
|
|
2728
2740
|
}
|
|
2729
2741
|
// 根据 https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2737356895760128&id1=null&iterationId=null&versionid=null&tab=info
|
|
@@ -2731,7 +2743,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2731
2743
|
// - 对argument.expression.typeAnnotation 无需做修改，保持为其实际类型
|
|
2732
2744
|
// - 对argument.typeAnnotation，为根据对应Collection的泛型参数的类型填写其类型
|
|
2733
2745
|
// 先不动这里，有空再调整
|
|
2734
|
-
if (
|
|
2746
|
+
if (isCallFn) {
|
|
2735
2747
|
if (oldNd.calleeNamespace === 'nasl.util') {
|
|
2736
2748
|
const calleeName = oldNd.calleeName;
|
|
2737
2749
|
const listFunctionParamIndexMaps = new Map(Object.entries({
|
|
@@ -2787,34 +2799,41 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2787
2799
|
}
|
|
2788
2800
|
}
|
|
2789
2801
|
if (!tyAnn) {
|
|
2802
|
+
const isCallItfc = oldNd.concept === 'CallInterface' ||
|
|
2803
|
+
oldNd.concept === 'CallAuthInterface' ||
|
|
2804
|
+
oldNd.concept === 'CallMicroserviceInterface' ||
|
|
2805
|
+
oldNd.concept === 'CallGatewayInterface';
|
|
2806
|
+
if (isCallType1 || isCallFn || isCallItfc) {
|
|
2807
|
+
newJson.typeAnnotation = nasl_language_server_core_1.naslVoidTy.toJSON();
|
|
2808
|
+
}
|
|
2790
2809
|
return newJson;
|
|
2791
2810
|
}
|
|
2792
|
-
if (oldNd.concept === 'CallQueryComponent' /* && !oldNd.isAutoInfer() 直接覆盖得了，老版的 typeAnnotation 问题有点多 */) {
|
|
2811
|
+
if (oldNd.concept === 'CallQueryComponent' /* && !oldNd.isAutoInfer() 直接覆盖得了，老版的 typeAnnotation 问题有点多 */) {
|
|
2793
2812
|
newJson.typeAnnotation = tyAnn;
|
|
2794
2813
|
// 新类型标注标的是对的，所以不再需要原来的改法（即，把 T 变为 { list:T, total: Long }
|
|
2795
2814
|
}
|
|
2796
2815
|
// 如果节点本身有类型就不去在塞一遍了
|
|
2797
2816
|
// 有值而且没有类型再去设置
|
|
2798
2817
|
// 但是Identifier 和 MemberExpression 都用标注出来的因为本身是变量，有类型也需要覆盖一下
|
|
2799
|
-
else if (tyAnn && (oldNd.concept === 'Argument') && oldNd.getAncestor('Connector')?.concept === 'Connector') {
|
|
2818
|
+
else if (tyAnn && (oldNd.concept === 'Argument') && oldNd.getAncestor('Connector')?.concept === 'Connector') {
|
|
2800
2819
|
newJson.typeAnnotation = tyAnn;
|
|
2801
2820
|
}
|
|
2802
2821
|
else if (oldNd.concept === 'Identifier' || oldNd.concept === 'MemberExpression') {
|
|
2803
2822
|
// @ts-ignore 处理 Match，还是需要，因为后端翻译比较特殊
|
|
2804
|
-
const iName = getNameOfIdAndMemExpr(newJson);
|
|
2823
|
+
const iName = getNameOfIdAndMemExpr(newJson);
|
|
2805
2824
|
newJson.typeAnnotation = matchExprTyAnnMap.has(iName) ? matchExprTyAnnMap.get(iName) : tyAnn;
|
|
2806
2825
|
}
|
|
2807
2826
|
else if ((oldNd.concept === 'NewComposite') &&
|
|
2808
|
-
(oldNd.typeAnnotation?.typeKind === 'anonymousStructure' || oldNd.typeAnnotation?.typeKind === 'generic')) {
|
|
2827
|
+
(oldNd.typeAnnotation?.typeKind === 'anonymousStructure' || oldNd.typeAnnotation?.typeKind === 'generic')) {
|
|
2809
2828
|
newJson.typeAnnotation = tyAnn;
|
|
2810
2829
|
}
|
|
2811
2830
|
// 服务端需要默认值节点有类型来判断父节点是否是日期类型
|
|
2812
2831
|
else if (newJson.concept === 'DefaultValue') {
|
|
2813
|
-
//
|
|
2832
|
+
// v3.14.x 先改成这样，应该直接拿就行
|
|
2814
2833
|
newJson.typeAnnotation = tyAnn;
|
|
2815
2834
|
}
|
|
2816
2835
|
// 定义上不挂类型
|
|
2817
|
-
else if ((!oldNd.typeAnnotation) && !nasl_language_server_core_1.ReferenceManager.defConcept.includes(oldNd.concept)) {
|
|
2836
|
+
else if ((!oldNd.typeAnnotation) && !nasl_language_server_core_1.ReferenceManager.defConcept.includes(oldNd.concept)) {
|
|
2818
2837
|
newJson.typeAnnotation = tyAnn;
|
|
2819
2838
|
}
|
|
2820
2839
|
return newJson;
|
|
@@ -3279,7 +3298,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3279
3298
|
this.logger.timeEnd('语言服务变更');
|
|
3280
3299
|
}
|
|
3281
3300
|
catch (e) {
|
|
3282
|
-
console.log('error', e);
|
|
3283
3301
|
console.error('error', e);
|
|
3284
3302
|
this.logger.info('no "naslServer:nodeChange" event received');
|
|
3285
3303
|
}
|