@lcap/nasl 2.18.0-beta.3 → 2.18.0-beta.5
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/bak/translator.js +1 -1
- package/out/bak/translator.js.map +1 -1
- package/out/concepts/LogicItem__.js.map +1 -1
- package/out/concepts/Logic__.js +4 -4
- package/out/concepts/Logic__.js.map +1 -1
- package/out/concepts/Match__.js +1 -1
- package/out/concepts/Match__.js.map +1 -1
- package/out/concepts/MemberExpression__.js.map +1 -1
- package/out/concepts/OqlQueryComponent__.js.map +1 -1
- package/out/concepts/Param__.js +2 -2
- package/out/concepts/Param__.js.map +1 -1
- package/out/concepts/Return__.js +1 -1
- package/out/concepts/Return__.js.map +1 -1
- package/out/concepts/StringInterpolation__.d.ts +16 -16
- package/out/concepts/StringInterpolation__.js +12 -12
- package/out/concepts/StringInterpolation__.js.map +1 -1
- package/out/concepts/ValidationRule__.js.map +1 -1
- package/out/concepts/Variable__.js +1 -1
- package/out/concepts/Variable__.js.map +1 -1
- package/out/concepts/View__.js +2 -2
- package/out/concepts/View__.js.map +1 -1
- package/out/generator/genReleaseBody.js +1 -1
- package/out/generator/genReleaseBody.js.map +1 -1
- package/out/server/naslServer.d.ts +2 -1
- package/out/server/naslServer.js +92 -40
- package/out/server/naslServer.js.map +1 -1
- package/out/templator/genQueryComponent.d.ts +2 -2
- package/out/templator/genQueryComponent.js +4 -1
- package/out/templator/genQueryComponent.js.map +1 -1
- package/package.json +2 -3
- package/src/bak/translator.js +1 -1
- package/src/concepts/CallInterface__.ts +9 -9
- package/src/concepts/Destination__.ts +9 -9
- package/src/concepts/ExternalDestination__.ts +5 -5
- package/src/concepts/LogicItem__.ts +4 -0
- package/src/concepts/Logic__.ts +42 -5
- package/src/concepts/Match__.ts +21 -1
- package/src/concepts/MemberExpression__.ts +11 -0
- package/src/concepts/OqlQueryComponent__.ts +7 -0
- package/src/concepts/Param__.ts +3 -2
- package/src/concepts/Return__.ts +5 -1
- package/src/concepts/StringInterpolation__.ts +26 -26
- package/src/concepts/UnaryExpression__.ts +4 -4
- package/src/concepts/ValidationRule__.ts +1 -1
- package/src/concepts/Variable__.ts +1 -1
- package/src/concepts/ViewElement__.ts +1 -1
- package/src/concepts/View__.ts +2 -2
- package/src/generator/genReleaseBody.ts +1 -1
- package/src/server/naslServer.ts +91 -41
- package/src/templator/genQueryComponent.ts +8 -3
- package/ts-worker/lib/cancellationToken.js +67 -0
- package/ts-worker/lib/harness.js +1 -1
- package/ts-worker/src/start.js +1 -1
- package/ts-worker/webpack.config.js +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genReleaseBody.js","sourceRoot":"","sources":["../../src/generator/genReleaseBody.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"genReleaseBody.js","sourceRoot":"","sources":["../../src/generator/genReleaseBody.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { Worker } from 'worker_threads';
|
|
3
3
|
import Messager from '../common/Messager';
|
|
4
4
|
import * as tsProtocol from 'typescript/lib/protocol';
|
|
5
|
-
import { Module, BaseNode, App, Structure, Logic, TypeAnnotation, View, Param, Argument } from '../concepts';
|
|
5
|
+
import { Module, BaseNode, App, Structure, Logic, TypeAnnotation, View, Param, Argument, ViewElement } from '../concepts';
|
|
6
6
|
import { SourceMap, SourceMapItem } from '../translator';
|
|
7
7
|
import { MinRange } from './translator';
|
|
8
8
|
import { EventPayload } from '../common';
|
|
@@ -101,6 +101,7 @@ export declare class NaslServer {
|
|
|
101
101
|
* @returns 全部类型的str 或者 最后一个.后的内容
|
|
102
102
|
*/
|
|
103
103
|
getDataSchemaType(node: BaseNode, allType?: boolean): Promise<string>;
|
|
104
|
+
getDataSchemaStructureOrTypeAnnotation(node: ViewElement): Promise<any>;
|
|
104
105
|
/**
|
|
105
106
|
* ts的 quickInfo方法,查询指定位置的详情
|
|
106
107
|
* @param args 文件信息数组
|
package/out/server/naslServer.js
CHANGED
|
@@ -538,6 +538,49 @@ class NaslServer {
|
|
|
538
538
|
}
|
|
539
539
|
return '';
|
|
540
540
|
}
|
|
541
|
+
async getDataSchemaStructureOrTypeAnnotation(node) {
|
|
542
|
+
if (!(node instanceof concepts_1.ViewElement))
|
|
543
|
+
return;
|
|
544
|
+
const { currentSource, fileNode } = this.getCurrentSource(node);
|
|
545
|
+
const quickInfo = await this._getTypeQuickinfo({
|
|
546
|
+
file: fileNode.getEmbeddedFilePath(),
|
|
547
|
+
line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
|
|
548
|
+
offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character) + `new nasl.ui.`.length,
|
|
549
|
+
});
|
|
550
|
+
if (quickInfo.responseRequired) {
|
|
551
|
+
const displayString = quickInfo?.response?.displayString || '';
|
|
552
|
+
const flag = displayString.includes('<') && displayString.includes('>');
|
|
553
|
+
if (!flag)
|
|
554
|
+
return;
|
|
555
|
+
const types = /\<([^()]+)\>/g.exec(displayString);
|
|
556
|
+
let typeStr = types && types[1];
|
|
557
|
+
const app = node.app;
|
|
558
|
+
if (typeStr.includes('__name: "AStructure_')) {
|
|
559
|
+
const properties = [];
|
|
560
|
+
typeStr
|
|
561
|
+
.replace(/([^:\s]+):\s+([^;]+);/g, ($1, name, typeKey) => {
|
|
562
|
+
if (name === '__name')
|
|
563
|
+
return;
|
|
564
|
+
typeKey = `app.${typeKey}`;
|
|
565
|
+
const keys = typeKey.split('.');
|
|
566
|
+
const typeName = keys.pop();
|
|
567
|
+
const typeNamespace = keys.join('.');
|
|
568
|
+
properties.push(concepts_1.StructureProperty.from({
|
|
569
|
+
name,
|
|
570
|
+
typeAnnotation: concepts_1.TypeAnnotation.from({
|
|
571
|
+
typeKind: 'reference',
|
|
572
|
+
typeName,
|
|
573
|
+
typeNamespace,
|
|
574
|
+
})
|
|
575
|
+
}));
|
|
576
|
+
return '';
|
|
577
|
+
});
|
|
578
|
+
return concepts_1.TypeAnnotation.createTypeAnonymousStructure(properties);
|
|
579
|
+
}
|
|
580
|
+
else if (typeStr.startsWith('structures'))
|
|
581
|
+
return app.findNodeByCompleteName(`app.${typeStr}`);
|
|
582
|
+
}
|
|
583
|
+
}
|
|
541
584
|
/**
|
|
542
585
|
* ts的 quickInfo方法,查询指定位置的详情
|
|
543
586
|
* @param args 文件信息数组
|
|
@@ -904,41 +947,37 @@ class NaslServer {
|
|
|
904
947
|
const jsCode = nodeIn.toJS();
|
|
905
948
|
if (!jsCode.includes(`${node.name} = `))
|
|
906
949
|
return;
|
|
907
|
-
//
|
|
908
|
-
if (
|
|
909
|
-
|
|
910
|
-
|
|
911
|
-
|
|
912
|
-
return;
|
|
913
|
-
if (node instanceof concepts_1.Variable
|
|
914
|
-
&& node.parentNode instanceof concepts_1.View
|
|
915
|
-
&& (nodeIn.logic?.params.find((param) => jsCode.includes(param.name))
|
|
916
|
-
|| nodeIn.logic?.virtualParams.find((vParam) => jsCode.includes(vParam.name))
|
|
917
|
-
|| nodeIn.logic?.variables.find((variable) => jsCode.includes(variable.name)))) {
|
|
950
|
+
// 页面局部变量
|
|
951
|
+
if (node instanceof concepts_1.Variable && node.parentNode instanceof concepts_1.View) {
|
|
952
|
+
// 跟页面局部变量无关的赋值过滤
|
|
953
|
+
if (!jsCode.includes(`this.${node.name} = `))
|
|
954
|
+
return;
|
|
918
955
|
// 直接赋值 logic 内局部变量、输入参数直接提示系统无法推断类型
|
|
919
|
-
if (
|
|
920
|
-
|
|
921
|
-
|
|
922
|
-
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
956
|
+
if (nodeIn.logic?.params.find((param) => jsCode.includes(param.name))
|
|
957
|
+
|| nodeIn.logic?.virtualParams.find((vParam) => jsCode.includes(vParam.name))
|
|
958
|
+
|| nodeIn.logic?.variables.find((variable) => jsCode.includes(variable.name))) {
|
|
959
|
+
if (!nodeIn.tsErrorDetail) {
|
|
960
|
+
const diagnostic = {
|
|
961
|
+
node: nodeIn,
|
|
962
|
+
severity: 'error',
|
|
963
|
+
message: `页面${nodeTypeName} ${node.name} 赋值页面逻辑内局部变量或输入参数时,系统无法推导类型。`,
|
|
964
|
+
};
|
|
965
|
+
nodeIn.tsErrorDetail = diagnostic;
|
|
966
|
+
diagnostics.push(diagnostic);
|
|
967
|
+
}
|
|
968
|
+
msg = '系统无法推断类型。';
|
|
927
969
|
}
|
|
928
|
-
msg = '系统无法推断类型。';
|
|
929
970
|
}
|
|
930
|
-
|
|
931
|
-
|
|
932
|
-
|
|
933
|
-
|
|
934
|
-
|
|
935
|
-
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
diagnostics.push(diagnostic);
|
|
939
|
-
}
|
|
940
|
-
msg = '必须赋值有返回值的内容。';
|
|
971
|
+
if (!nodeIn.tsErrorDetail) {
|
|
972
|
+
const diagnostic = {
|
|
973
|
+
node: nodeIn,
|
|
974
|
+
severity: 'error',
|
|
975
|
+
message: `${nodeIn.label}左边 ${node.name} 未设置类型,右边必须为有返回值的内容。`,
|
|
976
|
+
};
|
|
977
|
+
nodeIn.tsErrorDetail = diagnostic;
|
|
978
|
+
diagnostics.push(diagnostic);
|
|
941
979
|
}
|
|
980
|
+
msg = '必须赋值有返回值的内容。';
|
|
942
981
|
}
|
|
943
982
|
});
|
|
944
983
|
if (!msg)
|
|
@@ -2218,7 +2257,6 @@ class NaslServer {
|
|
|
2218
2257
|
const nodeTypeAnnotation = this.getCurrentNodeKnownTypeAnnotation(node);
|
|
2219
2258
|
if (nodeTypeAnnotation) {
|
|
2220
2259
|
types.set(node, nodeTypeAnnotation);
|
|
2221
|
-
node.__TypeAnnotation = nodeTypeAnnotation;
|
|
2222
2260
|
return;
|
|
2223
2261
|
}
|
|
2224
2262
|
// 要通过自己或者依赖关系拿的,二次遍历
|
|
@@ -2233,7 +2271,7 @@ class NaslServer {
|
|
|
2233
2271
|
'Return',
|
|
2234
2272
|
'Variable',
|
|
2235
2273
|
].includes(node.concept) && node.typeAnnotation) {
|
|
2236
|
-
node
|
|
2274
|
+
types.set(node, node.typeAnnotation);
|
|
2237
2275
|
return;
|
|
2238
2276
|
}
|
|
2239
2277
|
if (![
|
|
@@ -2300,7 +2338,9 @@ class NaslServer {
|
|
|
2300
2338
|
}
|
|
2301
2339
|
args.push(fileDetail);
|
|
2302
2340
|
});
|
|
2341
|
+
console.time('请求');
|
|
2303
2342
|
const resultMap = (await this.getNaslNodeTypeFull(args)).response;
|
|
2343
|
+
console.timeEnd('请求');
|
|
2304
2344
|
// console.log(resultMap);
|
|
2305
2345
|
// const result = (await this.getNaslNodeQuickInfoFull(args)).response;
|
|
2306
2346
|
// console.log(result);
|
|
@@ -2314,22 +2354,19 @@ class NaslServer {
|
|
|
2314
2354
|
const nodeTypeAnnotation = (0, formatTsUtils_1.type2TypeAnnotation)(item?.[0]?.nodeType);
|
|
2315
2355
|
// console.log(newQuickInfoNodes[index].node, nodeTypeAnnotation, nodeTypeAnnotation?.typeKey);
|
|
2316
2356
|
types.set(newQuickInfoNodes[index].node, nodeTypeAnnotation);
|
|
2317
|
-
newQuickInfoNodes[index].node.
|
|
2318
|
-
newQuickInfoNodes[index].node.__nodeType = item?.[0]?.nodeType;
|
|
2357
|
+
newQuickInfoNodes[index].node.__nodeType = Object.freeze(item?.[0]?.nodeType);
|
|
2319
2358
|
// console.log('方案1:', displayString1);
|
|
2320
2359
|
});
|
|
2321
2360
|
getFromOthers.forEach((type, node) => {
|
|
2322
2361
|
if (node instanceof concepts_1.Assignment) {
|
|
2323
2362
|
if (!types.get(node.left)) {
|
|
2324
2363
|
types.set(node.left, types.get(node.right));
|
|
2325
|
-
node.left.__TypeAnnotation = types.get(node.right);
|
|
2326
2364
|
}
|
|
2327
2365
|
}
|
|
2328
2366
|
else if (node instanceof concepts_1.Argument) {
|
|
2329
2367
|
// 如果Argument,但是没可以用的类型,就用原来logic的参数类型
|
|
2330
2368
|
const argType = this.getArgumentTypeAnnotation(node, newQuickInfoNodes, types);
|
|
2331
2369
|
types.set(node, argType);
|
|
2332
|
-
node.__TypeAnnotation = argType.typeAnnotation;
|
|
2333
2370
|
}
|
|
2334
2371
|
else if (node instanceof concepts_1.MatchCase) {
|
|
2335
2372
|
// matchCase的类型
|
|
@@ -2338,14 +2375,27 @@ class NaslServer {
|
|
|
2338
2375
|
const last = node.body[node.body.length - 1];
|
|
2339
2376
|
if (last.__TypeAnnotation) {
|
|
2340
2377
|
types.set(node, last.__TypeAnnotation);
|
|
2341
|
-
node.__TypeAnnotation = last.__TypeAnnotation;
|
|
2342
2378
|
}
|
|
2343
2379
|
}
|
|
2344
2380
|
}
|
|
2345
2381
|
});
|
|
2346
|
-
//
|
|
2382
|
+
// 重置类型状态, 并且赋值
|
|
2347
2383
|
types.forEach((value, node) => {
|
|
2348
|
-
|
|
2384
|
+
try {
|
|
2385
|
+
// 因为node可能是经过处理的TypeAnnotation
|
|
2386
|
+
node.__isCorrectTypeAnnotation = true;
|
|
2387
|
+
if (value) {
|
|
2388
|
+
if (value instanceof concepts_1.TypeAnnotation) {
|
|
2389
|
+
node.__TypeAnnotation = Object.freeze(value);
|
|
2390
|
+
}
|
|
2391
|
+
else if (value.typeAnnotation) {
|
|
2392
|
+
node.__TypeAnnotation = Object.freeze(value.typeAnnotation);
|
|
2393
|
+
}
|
|
2394
|
+
}
|
|
2395
|
+
}
|
|
2396
|
+
catch (err) {
|
|
2397
|
+
console.log(err);
|
|
2398
|
+
}
|
|
2349
2399
|
});
|
|
2350
2400
|
// newQuickInfoNodes.forEach((itemDetail, index) => {
|
|
2351
2401
|
// const { node, filePath } = itemDetail;
|
|
@@ -2443,6 +2493,7 @@ class NaslServer {
|
|
|
2443
2493
|
}
|
|
2444
2494
|
// 增量标注
|
|
2445
2495
|
async IncrementalAnnotationJSON(records) {
|
|
2496
|
+
console.time('增量标注');
|
|
2446
2497
|
const nodes = [];
|
|
2447
2498
|
records.forEach((record) => {
|
|
2448
2499
|
const fileNode = this.file2NodeMap.get(record.filePath);
|
|
@@ -2461,6 +2512,7 @@ class NaslServer {
|
|
|
2461
2512
|
}
|
|
2462
2513
|
});
|
|
2463
2514
|
await this.getQuickInfoNodesTypeMap(nodes);
|
|
2515
|
+
console.timeEnd('增量标注');
|
|
2464
2516
|
}
|
|
2465
2517
|
annotationToJson(typesMap, json) {
|
|
2466
2518
|
typesMap.forEach((value, node) => {
|