@lcap/nasl 4.1.0-beta.1 → 4.1.0-beta.2
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 +115 -43
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/release-body/body.d.ts +2 -0
- package/out/generator/release-body/body.d.ts.map +1 -1
- package/out/generator/release-body/body.js +18 -3
- package/out/generator/release-body/body.js.map +1 -1
- package/out/generator/release-body/data.d.ts +4 -2
- package/out/generator/release-body/data.d.ts.map +1 -1
- package/out/generator/release-body/data.js +92 -36
- package/out/generator/release-body/data.js.map +1 -1
- package/out/generator/release-body/internal.d.ts +1 -0
- package/out/generator/release-body/internal.d.ts.map +1 -1
- package/out/generator/release-body/internal.js.map +1 -1
- package/out/generator/release-body/share-content.d.ts.map +1 -1
- package/out/generator/release-body/share-content.js +3 -0
- package/out/generator/release-body/share-content.js.map +1 -1
- package/out/generator/release-body/utils.d.ts +3 -0
- package/out/generator/release-body/utils.d.ts.map +1 -1
- package/out/index.d.ts +1 -0
- package/out/index.d.ts.map +1 -1
- package/out/index.js +8 -1
- package/out/index.js.map +1 -1
- package/out/manager/diagnostic.d.ts +0 -1
- package/out/manager/diagnostic.d.ts.map +1 -1
- package/out/manager/diagnostic.js +0 -7
- package/out/manager/diagnostic.js.map +1 -1
- package/out/natural/parseNaturalTS.js +1 -1
- package/out/natural/parseNaturalTS.js.map +1 -1
- package/out/natural/transforms/transform2Entity.js +3 -0
- package/out/natural/transforms/transform2Entity.js.map +1 -1
- package/out/server/naslServer.d.ts +5 -2
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +141 -85
- package/out/server/naslServer.js.map +1 -1
- package/out/service/autofix/rules/rule-assign-local-variable-in-playground.d.ts.map +1 -1
- package/out/service/autofix/rules/rule-assign-local-variable-in-playground.js +37 -25
- package/out/service/autofix/rules/rule-assign-local-variable-in-playground.js.map +1 -1
- package/out/service/storage/cache/index.js +1 -1
- package/out/service/storage/cache/index.js.map +1 -1
- package/out/service/storage/init.d.ts +0 -16
- package/out/service/storage/init.d.ts.map +1 -1
- package/out/service/storage/init.js +74 -7
- package/out/service/storage/init.js.map +1 -1
- package/out/service/storage/taskQueue.d.ts +23 -0
- package/out/service/storage/taskQueue.d.ts.map +1 -0
- package/out/service/storage/taskQueue.js +242 -0
- package/out/service/storage/taskQueue.js.map +1 -0
- package/out/service/storage/types.d.ts +14 -4
- package/out/service/storage/types.d.ts.map +1 -1
- package/out/templator/block2nasl/viewMergeBlock.js +5 -6
- package/out/templator/block2nasl/viewMergeBlock.js.map +1 -1
- package/out/templator/genEditTableBlock.d.ts.map +1 -1
- package/out/templator/genEditTableBlock.js +0 -3
- package/out/templator/genEditTableBlock.js.map +1 -1
- package/out/templator/genTableBlock.d.ts.map +1 -1
- package/out/templator/genTableBlock.js +0 -3
- package/out/templator/genTableBlock.js.map +1 -1
- package/out/utils/index.d.ts +0 -1
- package/out/utils/index.d.ts.map +1 -1
- package/out/utils/index.js +0 -14
- package/out/utils/index.js.map +1 -1
- package/package.json +12 -10
- package/sandbox/stdlib/nasl.core.spec.ts +49 -0
- package/sandbox/stdlib/nasl.core.ts +2 -2
- package/sandbox/stdlib/nasl.processV2.ts +1 -0
- package/sandbox/stdlib/nasl.util.ts +4 -4
- package/out/utils/language-cache/constant.d.ts +0 -19
- package/out/utils/language-cache/constant.d.ts.map +0 -1
- package/out/utils/language-cache/constant.js +0 -35
- package/out/utils/language-cache/constant.js.map +0 -1
- package/out/utils/language-cache/index.d.ts +0 -3
- package/out/utils/language-cache/index.d.ts.map +0 -1
- package/out/utils/language-cache/index.js +0 -19
- package/out/utils/language-cache/index.js.map +0 -1
- package/out/utils/language-cache/nasl.d.ts +0 -2
- package/out/utils/language-cache/nasl.d.ts.map +0 -1
- package/out/utils/language-cache/nasl.js +0 -3
- package/out/utils/language-cache/nasl.js.map +0 -1
- package/out/utils/language-cache/types.d.ts +0 -45
- package/out/utils/language-cache/types.d.ts.map +0 -1
- package/out/utils/language-cache/types.js +0 -4
- package/out/utils/language-cache/types.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseNaturalTS.js","sourceRoot":"","sources":["../../src/natural/parseNaturalTS.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parseNaturalTS.js","sourceRoot":"","sources":["../../src/natural/parseNaturalTS.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,9 @@ function transform2EntityProperty(node) {
|
|
|
23
23
|
property.typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(node.typeAnnotation.typeAnnotation);
|
|
24
24
|
if (property.name === 'id')
|
|
25
25
|
property.primaryKey = true;
|
|
26
|
+
if (!['id', 'createdTime', 'updatedTime', 'createdBy', 'updatedBy'].includes(property.name)) {
|
|
27
|
+
property.generationRule = 'manual';
|
|
28
|
+
}
|
|
26
29
|
const decoratorsExpression = node.decorators?.[0]?.expression;
|
|
27
30
|
if (decoratorsExpression?.type === 'CallExpression' && decoratorsExpression?.callee?.name === 'EntityRelation') {
|
|
28
31
|
const decoratorsNode = decoratorsExpression?.typeParameters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2Entity.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Entity.ts"],"names":[],"mappings":";;;AAAA,mCAAqJ;AACrJ,yEAAsE;AAGtE,SAAgB,gBAAgB,CAAC,IAAiC;IAC9D,MAAM,MAAM,GAAG,IAAI,iBAAS,CAAC,MAAM,EAAE,CAAC;IACtC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9C,MAAM,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7D,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAChC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AAbD,4CAaC;AAED,SAAS,wBAAwB,CAAC,IAA8B;IAC5D,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,cAAc,EAAE,CAAC;IAChD,QAAQ,CAAC,UAAU,GAAG,QAAQ,CAAC,IAAI,GAAI,IAAI,CAAC,GAA6B,CAAC,IAAI,CAAC;IAC/E,QAAQ,CAAC,KAAK,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACzD,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAE,IAAI,CAAC,cAA8C,CAAC,cAAc,CAAC,CAAC;IACxH,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI;QAAE,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC;IACvD,MAAM,oBAAoB,GAAI,IAAI,CAAC,UAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,UAAiB,CAAC;IAC9E,IAAI,oBAAoB,EAAE,IAAI,KAAK,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,EAAE,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAC/G,MAAM,cAAc,GAAG,oBAAoB,EAAE,cAAc,CAAC;QAC5D,IAAI,cAAc,EAAE,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YACtF,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAQ,CAAC;YACtD,MAAM,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,aAAa,EAAE,SAAS,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACvE,MAAM,cAAc,GAAG,IAAA,gBAAQ,EAAC,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACvF,MAAM,iBAAiB,GAAG,IAAA,gBAAQ,EAAC,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACzF,QAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;YAC/C,QAAQ,CAAC,cAAc,GAAG,cAAc,CAAC;YACzC,QAAQ,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YAChE,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAA;QACjC,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC"}
|
|
1
|
+
{"version":3,"file":"transform2Entity.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Entity.ts"],"names":[],"mappings":";;;AAAA,mCAAqJ;AACrJ,yEAAsE;AAGtE,SAAgB,gBAAgB,CAAC,IAAiC;IAC9D,MAAM,MAAM,GAAG,IAAI,iBAAS,CAAC,MAAM,EAAE,CAAC;IACtC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9C,MAAM,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7D,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAChC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AAbD,4CAaC;AAED,SAAS,wBAAwB,CAAC,IAA8B;IAC5D,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,cAAc,EAAE,CAAC;IAChD,QAAQ,CAAC,UAAU,GAAG,QAAQ,CAAC,IAAI,GAAI,IAAI,CAAC,GAA6B,CAAC,IAAI,CAAC;IAC/E,QAAQ,CAAC,KAAK,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACzD,QAAQ,CAAC,cAAc,GAAG,IAAA,mDAAwB,EAAE,IAAI,CAAC,cAA8C,CAAC,cAAc,CAAC,CAAC;IACxH,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI;QAAE,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC;IACvD,IAAI,CAAC,CAAC,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5F,QAAQ,CAAC,cAAc,GAAG,QAAQ,CAAC;IACrC,CAAC;IACD,MAAM,oBAAoB,GAAI,IAAI,CAAC,UAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,UAAiB,CAAC;IAC9E,IAAI,oBAAoB,EAAE,IAAI,KAAK,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,EAAE,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAC/G,MAAM,cAAc,GAAG,oBAAoB,EAAE,cAAc,CAAC;QAC5D,IAAI,cAAc,EAAE,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YACtF,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAQ,CAAC;YACtD,MAAM,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,aAAa,EAAE,SAAS,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACvE,MAAM,cAAc,GAAG,IAAA,gBAAQ,EAAC,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACvF,MAAM,iBAAiB,GAAG,IAAA,gBAAQ,EAAC,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YACzF,QAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;YAC/C,QAAQ,CAAC,cAAc,GAAG,cAAc,CAAC;YACzC,QAAQ,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YAChE,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAA;QACjC,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC"}
|
|
@@ -71,6 +71,8 @@ declare class NaslServer {
|
|
|
71
71
|
typerRemoveNodes: Set<SyntaxNode>;
|
|
72
72
|
typerCreateNodes: Set<SyntaxNode>;
|
|
73
73
|
oqlRemoveNodesTsPath: Set<string>;
|
|
74
|
+
removedConnectors: Set<Connector>;
|
|
75
|
+
originProxyTargetNodes: Set<SyntaxNode>;
|
|
74
76
|
createUiTsArg0Copy: any;
|
|
75
77
|
createUiTsArg1Copy: any;
|
|
76
78
|
typerErrRecords: DiagnosticRecord[];
|
|
@@ -337,7 +339,6 @@ declare class NaslServer {
|
|
|
337
339
|
*/
|
|
338
340
|
getArgumentTypeAnnotationWithGenerator(node: Argument, types: Map<BaseNode, TypeAnnotation>): Generator<void, TypeAnnotation, void>;
|
|
339
341
|
getCurrentTypeAnnotation(node: BaseNode): Promise<TypeAnnotation>;
|
|
340
|
-
getBaseNodesTypeMap(nodes: Array<BaseNode>): Promise<QuickInfoMap>;
|
|
341
342
|
getBindAttributeType(node: BindAttribute): Promise<TypeAnnotation | {
|
|
342
343
|
typeAnnotation: TypeAnnotation;
|
|
343
344
|
option: any;
|
|
@@ -369,6 +370,7 @@ declare class NaslServer {
|
|
|
369
370
|
* @returns 需要校验的文件名
|
|
370
371
|
*/
|
|
371
372
|
private prepareAndWriteTsFilesToCheck;
|
|
373
|
+
getContextVariables(node: SyntaxNode): Promise<import("@lcap/nasl-language-server-core/out/query/context-variable-query").ContextVariableInfo[]>;
|
|
372
374
|
/**
|
|
373
375
|
* 获取 Connector 对应 Connector 的properties
|
|
374
376
|
*/
|
|
@@ -419,7 +421,8 @@ declare class NaslServer {
|
|
|
419
421
|
/** 新语言服务初始化 */
|
|
420
422
|
private languageServerInitiate;
|
|
421
423
|
getProxyNode: (nd: BaseNode) => SyntaxNode;
|
|
422
|
-
|
|
424
|
+
private _getAllElementLogicRoots;
|
|
425
|
+
private _refreshTreeViews;
|
|
423
426
|
}
|
|
424
427
|
export { NaslServer };
|
|
425
428
|
//# sourceMappingURL=naslServer.d.ts.map
|
|
@@ -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,EAIL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,aAAa,EAKb,aAAa,EAkCb,SAAS,EAET,UAAU,EAmBV,UAAU,EAGV,YAAY,EAIZ,yBAAyB,
|
|
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
|
@@ -39,6 +39,7 @@ const nasl_sentry_1 = require("@lcap/nasl-sentry");
|
|
|
39
39
|
const Messager_1 = __importDefault(require("../common/Messager"));
|
|
40
40
|
const oql_cache_1 = require("./OQL/oql-cache");
|
|
41
41
|
const initial_1 = require("../service/initial");
|
|
42
|
+
const set_1 = require("mnemonist/set");
|
|
42
43
|
/// #if process.env.BUILD_TARGET === 'node'
|
|
43
44
|
const fs = __importStar(require("fs-extra"));
|
|
44
45
|
const path = __importStar(require("path"));
|
|
@@ -170,8 +171,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
170
171
|
this.typerRemoveNodes = new Set();
|
|
171
172
|
// 创建的节点
|
|
172
173
|
this.typerCreateNodes = new Set();
|
|
173
|
-
// 临时
|
|
174
|
+
// 临时 hack：OQL 需要删除的节点（NASL 节点重命名，老名字对应的 TS 节点需删除
|
|
174
175
|
this.oqlRemoveNodesTsPath = new Set();
|
|
176
|
+
// 临时 hack：删除的连接器中的文件级别的节点
|
|
177
|
+
this.removedConnectors = new Set();
|
|
178
|
+
// 变动的原始目标节点，带有 proxy，用于触发响应式更新：事件树，子逻辑树等
|
|
179
|
+
this.originProxyTargetNodes = new Set();
|
|
175
180
|
this.typerErrRecords = [];
|
|
176
181
|
// 确保首屏检查没有"传统艺能"、"时序问题"
|
|
177
182
|
this.cachedEventPayloadValues = [];
|
|
@@ -206,8 +211,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
206
211
|
* @param oqlRemoveNodesTsPath 需要删除的文件路径
|
|
207
212
|
* @returns 需要校验的文件名
|
|
208
213
|
*/
|
|
209
|
-
this.prepareAndWriteTsFilesToCheck = async (
|
|
210
|
-
const oqlFiles = (0, nasl_language_server_core_1.getOqlFiles)(this.semEnv, chkFiles, removedNodes);
|
|
214
|
+
this.prepareAndWriteTsFilesToCheck = async (oqlFiles, removedNodes, oqlRemoveNodesTsPath) => {
|
|
211
215
|
function getETSFilePath(fileNode) {
|
|
212
216
|
try {
|
|
213
217
|
return fileNode.getEmbeddedFilePath();
|
|
@@ -236,8 +240,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
236
240
|
}
|
|
237
241
|
const tsFilePathsToCheck = new Set();
|
|
238
242
|
for (const fileNode of oqlFiles) {
|
|
239
|
-
this.semData.isFirstScreen = true; // getter 会看 naslServer.semData.isFirstScreen
|
|
240
|
-
this.semData.redirectSlowGetters(NaslServer_1.toRaw(this.getProxyApp()));
|
|
241
243
|
let tsFilePath;
|
|
242
244
|
try {
|
|
243
245
|
tsFilePath = fileNode.getEmbeddedFilePath();
|
|
@@ -270,14 +272,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
270
272
|
fileNode.sourceMap = tsFile.sourceMap;
|
|
271
273
|
// 麻了，查了半天是没 set 这里
|
|
272
274
|
this.file2NodeMap.set(tsFile.filePath, fileNode);
|
|
273
|
-
this.semData.recoverSlowGetters();
|
|
274
|
-
this.semData.clearSemanticData();
|
|
275
|
-
this.semData.isFirstScreen = false;
|
|
276
275
|
}
|
|
277
276
|
if (utils.isDebugMode) {
|
|
278
277
|
console.info('TS 校验以下文件', Array.from(oqlFiles).map((item) => item.getEmbeddedFilePath()));
|
|
279
278
|
}
|
|
280
|
-
console.timeEnd('TS 文件变更');
|
|
279
|
+
utils.isDebugMode && console.timeEnd('TS 文件变更');
|
|
281
280
|
return { tsFilePathsToCheck };
|
|
282
281
|
};
|
|
283
282
|
this.getProxyNode = (nd) => {
|
|
@@ -314,7 +313,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
314
313
|
const instance = globalThis.window;
|
|
315
314
|
const baseIdePath = instance?.baseIdePath;
|
|
316
315
|
const hash = process.env.COMMIT_HASH || '';
|
|
317
|
-
const filename = instance?.electron
|
|
316
|
+
const filename = instance?.electron?.createWorker
|
|
318
317
|
? 'tsserver.electron.js'
|
|
319
318
|
: 'tsserver.js';
|
|
320
319
|
// @ts-ignore
|
|
@@ -351,7 +350,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
351
350
|
// 已经和 NASL 节点配对的诊断信息
|
|
352
351
|
const isProfileMode = this.flags.profileMode;
|
|
353
352
|
if (this.isFirstScreen) {
|
|
354
|
-
console.time('\x1b[44m\x1b[97m 用户体感首屏检查耗时 \x1b[0m');
|
|
353
|
+
utils.isDebugMode && console.time('\x1b[44m\x1b[97m 用户体感首屏检查耗时 \x1b[0m');
|
|
355
354
|
// 对OQL节点加载来自TS的错误
|
|
356
355
|
tsDiagnostics.forEach(({ node, message }) => {
|
|
357
356
|
if (node.errorsFromTSServer) {
|
|
@@ -367,7 +366,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
367
366
|
let fixAllUseBeforeAssignTasks = [];
|
|
368
367
|
const rawApp = NaslServer_1.toRaw(this.getProxyApp());
|
|
369
368
|
// 让事件逻辑显示出来
|
|
370
|
-
this.
|
|
369
|
+
this._getAllElementLogicRoots();
|
|
371
370
|
try {
|
|
372
371
|
// 目前里面包含所有定义、逻辑、业务组件、前端全局变量等
|
|
373
372
|
fixAllUseBeforeAssignTasks = await (0, nasl_language_server_core_1.firstScreenCheckAndCompare)(this.semEnv, rawApp);
|
|
@@ -416,10 +415,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
416
415
|
if (isProfileMode) {
|
|
417
416
|
console.profileEnd('diag');
|
|
418
417
|
}
|
|
419
|
-
console.timeEnd('\x1b[44m\x1b[97m 用户体感首屏检查耗时 \x1b[0m');
|
|
418
|
+
utils.isDebugMode && console.timeEnd('\x1b[44m\x1b[97m 用户体感首屏检查耗时 \x1b[0m');
|
|
420
419
|
}
|
|
421
|
-
|
|
422
|
-
this.semData.clearSemanticData();
|
|
420
|
+
(0, nasl_language_server_core_1.clearFileNodeCache)();
|
|
423
421
|
}
|
|
424
422
|
this.notifyPublishDiagnosticsEnd(tsDiagnostics);
|
|
425
423
|
if (this.firstScreenEndWork) {
|
|
@@ -489,21 +487,28 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
489
487
|
}
|
|
490
488
|
catch (err) {
|
|
491
489
|
this.logger.info(err);
|
|
492
|
-
|
|
490
|
+
if (item.originEvent) {
|
|
491
|
+
this.changeStackList.push(item.originEvent);
|
|
492
|
+
}
|
|
493
493
|
}
|
|
494
494
|
});
|
|
495
495
|
// 如果有长度，那么触发类型检查
|
|
496
496
|
if (this.changeStackList.length) {
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
497
|
+
try {
|
|
498
|
+
itemEventPtr.forEach(payload => {
|
|
499
|
+
// 增量更新 step 1：处理 create、delete、update 的局部符号
|
|
500
|
+
const startTime = performance.now();
|
|
501
|
+
this.semEnv.refMgr.updateRefsInNaslFragment(this.semEnv, payload);
|
|
502
|
+
const endTime = performance.now();
|
|
503
|
+
const duration = endTime - startTime;
|
|
504
|
+
if (duration > 10) {
|
|
505
|
+
console.log(`\x1b[44m\x1b[97m Reference manager: Update Nasl Fragment References took ${duration.toFixed(2)}ms \x1b[0m`);
|
|
506
|
+
}
|
|
507
|
+
});
|
|
508
|
+
}
|
|
509
|
+
catch (err) {
|
|
510
|
+
this.logger.error('error: update references in nasl fragment', err);
|
|
511
|
+
}
|
|
507
512
|
void this.flushChangesForTypeChecking().catch(err => {
|
|
508
513
|
this.logger.error('triggerTypeChecking error', err);
|
|
509
514
|
});
|
|
@@ -549,20 +554,28 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
549
554
|
// 基础组件
|
|
550
555
|
await this.addFile(naslUiComponentTsFile, { cache: true });
|
|
551
556
|
this._debugPutFilesInAnonymousApp([naslUiComponentTsFile]);
|
|
552
|
-
|
|
553
|
-
await this.addFile({
|
|
557
|
+
const extensionComponentFile = {
|
|
554
558
|
file: 'extension.component.ts',
|
|
555
559
|
fileContent: convertTsCode(options.withTypeLibraryTsCode),
|
|
556
|
-
}
|
|
560
|
+
};
|
|
561
|
+
// 带有类型的依赖库组件
|
|
562
|
+
await this.addFile(extensionComponentFile, { cache: true });
|
|
563
|
+
this._debugPutFilesInAnonymousApp([extensionComponentFile]);
|
|
557
564
|
resolve(() => {
|
|
558
565
|
(0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, naslUiComponentTsFile.fileContent);
|
|
559
|
-
if (
|
|
560
|
-
(0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr,
|
|
566
|
+
if (extensionComponentFile.fileContent) {
|
|
567
|
+
(0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, extensionComponentFile.fileContent);
|
|
561
568
|
}
|
|
562
569
|
// allComponent中包含一些定义独此一份的legacy扩展组件，因此需要加载
|
|
563
|
-
Object.values(allComponent).forEach(v => {
|
|
570
|
+
Object.values(allComponent).forEach((v) => {
|
|
564
571
|
this.semEnv.refMgr.compDefMgr.addLegacy(v, 'allComponent legacy');
|
|
565
572
|
});
|
|
573
|
+
const allNodesAPI = (0, concepts_1.getConfig)().allNodesAPI;
|
|
574
|
+
Object.keys(allNodesAPI).forEach((tag) => {
|
|
575
|
+
const component = allNodesAPI[tag];
|
|
576
|
+
// @ts-expect-error FIXME wudengke
|
|
577
|
+
this.semEnv.refMgr.compDefMgr.add(component, 'from allNodesAPI');
|
|
578
|
+
});
|
|
566
579
|
});
|
|
567
580
|
// 内置标准库类型
|
|
568
581
|
Object.keys(naslStdlibMap_1.default).forEach(async (libFileName) => {
|
|
@@ -813,9 +826,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
813
826
|
this.semData = new nasl_concepts_1.SemanticData();
|
|
814
827
|
// 除此之外，好像没什么简单的方法可以让 __xxx.ts 文件快速拿到 app.naslServer 的引用了……
|
|
815
828
|
// @ts-ignore
|
|
816
|
-
this.semData.redirectSlowGetters(rawApp);
|
|
817
|
-
// @ts-ignore
|
|
818
829
|
this.semData.collectAllSemanticCtx(rawApp);
|
|
830
|
+
// @ts-ignore
|
|
831
|
+
this.semData.redirectSlowGetters(rawApp);
|
|
819
832
|
this.logger.timeEnd('全量生成 TS——翻译——简单语义分析');
|
|
820
833
|
const { notifyEndWork } = this.notifyStartWork();
|
|
821
834
|
this.firstScreenEndWork = () => {
|
|
@@ -839,6 +852,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
839
852
|
await this.waitOqlQueryComponentChildrenFinish(app);
|
|
840
853
|
// 翻译 ts 文件
|
|
841
854
|
const results = await utils.runGeneratorAsync(getAllTsFiles());
|
|
855
|
+
this.semData.recoverSlowGetters();
|
|
856
|
+
this.semData.clearSemanticData();
|
|
842
857
|
const files = results.map((result) => ({
|
|
843
858
|
file: result.filePath,
|
|
844
859
|
fileContent: result.code,
|
|
@@ -1741,7 +1756,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
1741
1756
|
// 如果 name 不改，那就是要改命名空间
|
|
1742
1757
|
if (nd instanceof concepts_1.Frontend || newValue === name) {
|
|
1743
1758
|
const { namespace } = minRange.node;
|
|
1744
|
-
if (namespace
|
|
1759
|
+
if (namespace?.includes(`.frontends.${nd.name}.`)) {
|
|
1745
1760
|
minRange.setTypeMethods = 'setNamespace';
|
|
1746
1761
|
minRange.newValue = namespace.replace(`.frontends.${nd.name}.`, `.frontends.${newValue}.`);
|
|
1747
1762
|
}
|
|
@@ -1859,6 +1874,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
1859
1874
|
if (minRange.node instanceof concepts_1.QueryGroupByExpression) {
|
|
1860
1875
|
minRange.setTypeMethods = 'setPropertyName';
|
|
1861
1876
|
}
|
|
1877
|
+
// foreign key 外键
|
|
1878
|
+
if (minRange.node instanceof concepts_1.EntityProperty) {
|
|
1879
|
+
const entityOfNd = nd.parentNode;
|
|
1880
|
+
const entityOfRef = minRange.node.parentNode;
|
|
1881
|
+
if (entityOfRef.concept === 'Entity' && entityOfNd.concept === 'Entity' &&
|
|
1882
|
+
entityOfNd.name !== entityOfRef.name) {
|
|
1883
|
+
minRange.setTypeMethods = 'setRelationProperty';
|
|
1884
|
+
}
|
|
1885
|
+
}
|
|
1862
1886
|
}
|
|
1863
1887
|
// 如果要修改索引的
|
|
1864
1888
|
if (minRange.node instanceof concepts_1.EntityIndex) {
|
|
@@ -2167,6 +2191,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2167
2191
|
}
|
|
2168
2192
|
// 获取element方法的可选值
|
|
2169
2193
|
getFieldKeySelectCompletion(nd, fieldKey) {
|
|
2194
|
+
console.warn('obsolete API');
|
|
2170
2195
|
const { currentSource, fileNode } = NaslServer_1.getCurrentSource(nd);
|
|
2171
2196
|
if (currentSource && fileNode) {
|
|
2172
2197
|
const range = {
|
|
@@ -2191,6 +2216,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2191
2216
|
}
|
|
2192
2217
|
}
|
|
2193
2218
|
getSlotCurrentCompletion(nd) {
|
|
2219
|
+
console.warn('obsolete API');
|
|
2194
2220
|
const { currentSource, fileNode } = NaslServer_1.getCurrentSource(nd);
|
|
2195
2221
|
if (currentSource && fileNode) {
|
|
2196
2222
|
const range = {
|
|
@@ -2208,6 +2234,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2208
2234
|
}
|
|
2209
2235
|
}
|
|
2210
2236
|
_getFieldKeySelectCompletion(args) {
|
|
2237
|
+
console.warn('obsolete API');
|
|
2211
2238
|
return this.messager.requestCommand('getFieldKeySelectCompletion', args);
|
|
2212
2239
|
}
|
|
2213
2240
|
/**
|
|
@@ -2472,6 +2499,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2472
2499
|
try {
|
|
2473
2500
|
// 因为node可能是经过处理的TypeAnnotation
|
|
2474
2501
|
node.__isCorrectTypeAnnotation = true;
|
|
2502
|
+
if (node instanceof concepts_1.OqlQueryComponent) {
|
|
2503
|
+
// HACK 目前TS类型标注和节点上的错误信息清空是耦合的。之后需要下掉TS OQL检查
|
|
2504
|
+
node.errorsFromTSServer = undefined;
|
|
2505
|
+
}
|
|
2475
2506
|
if (ty) {
|
|
2476
2507
|
if (node instanceof concepts_1.OqlQueryComponent) {
|
|
2477
2508
|
// 自动推导情况
|
|
@@ -3104,20 +3135,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3104
3135
|
await this.lsRunEnd;
|
|
3105
3136
|
return this.semEnv.getType(node);
|
|
3106
3137
|
}
|
|
3107
|
-
// 获取节点标注，去动态查
|
|
3108
|
-
async getBaseNodesTypeMap(nodes) {
|
|
3109
|
-
const args = nodes.map((item) => {
|
|
3110
|
-
const { currentSource, fileNode } = item.getCurrentSource();
|
|
3111
|
-
return {
|
|
3112
|
-
filePath: fileNode.getEmbeddedFilePath(),
|
|
3113
|
-
node: item,
|
|
3114
|
-
item: currentSource,
|
|
3115
|
-
};
|
|
3116
|
-
});
|
|
3117
|
-
const typesMap = await this.getQuickInfoNodesTypeMap(args);
|
|
3118
|
-
return typesMap;
|
|
3119
|
-
}
|
|
3120
3138
|
async getBindAttributeType(node) {
|
|
3139
|
+
console.warn('obsolete API');
|
|
3121
3140
|
// 过滤掉一些不需要查找的属性
|
|
3122
3141
|
const excludes = ['dataSource'];
|
|
3123
3142
|
if (excludes.includes(node.name)) {
|
|
@@ -3203,41 +3222,39 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3203
3222
|
if (targetNode instanceof concepts_1.I18nInfo) {
|
|
3204
3223
|
return;
|
|
3205
3224
|
}
|
|
3225
|
+
NaslServer_1.toRaw(this.originProxyTargetNodes).add(targetNode);
|
|
3206
3226
|
// FIXME: 验证完成后需要移除
|
|
3207
3227
|
const { fileNode: fileNode2 } = NaslServer_1.getCurrentSource(targetNode);
|
|
3208
3228
|
const fileNode = (0, service_1.getFileNode)(targetNode);
|
|
3209
3229
|
const fileNodeRaw = NaslServer_1.toRaw(fileNode);
|
|
3210
3230
|
fileNodeRaw !== NaslServer_1.toRaw(fileNode2) && console.log('\x1b[41m\x1b[97m☁️ handleAllChange 事件 fileNode 校验失败\x1b[0m');
|
|
3211
3231
|
const targetNodeRaw = NaslServer_1.toRaw(targetNode);
|
|
3212
|
-
// 处理定义节点或引用节点，更新typerCheckFiles和typerRemoveNodes
|
|
3213
|
-
let result =
|
|
3232
|
+
// 处理定义节点或引用节点，更新 typerCheckFiles 和 typerRemoveNodes
|
|
3233
|
+
let result = false;
|
|
3214
3234
|
if (nasl_language_server_core_1.ReferenceManager.defConcept.includes(targetNodeRaw.concept)) {
|
|
3215
3235
|
if (action === 'update') {
|
|
3216
3236
|
if (payload?.field === 'name') {
|
|
3217
3237
|
const oldName = payload.oldObjNasl?.[0];
|
|
3218
|
-
result = (0, nasl_language_server_core_1.preProcessDefRename)(this.semEnv, targetNodeRaw, oldName, this.currentRenameMode, this.oqlRemoveNodesTsPath);
|
|
3238
|
+
result = (0, nasl_language_server_core_1.preProcessDefRename)(this.semEnv, targetNodeRaw, this.typerCheckFiles, oldName, this.currentRenameMode, this.oqlRemoveNodesTsPath);
|
|
3219
3239
|
this.currentRenameMode = null;
|
|
3220
3240
|
}
|
|
3221
3241
|
else {
|
|
3222
|
-
result = (0, nasl_language_server_core_1.
|
|
3242
|
+
result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
|
|
3223
3243
|
}
|
|
3224
3244
|
}
|
|
3225
3245
|
else if (action === 'create') {
|
|
3226
|
-
result = (0, nasl_language_server_core_1.
|
|
3246
|
+
result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
|
|
3247
|
+
this.typerCreateNodes.add(targetNodeRaw);
|
|
3227
3248
|
}
|
|
3228
3249
|
else if (action === 'delete') {
|
|
3229
|
-
result = (0, nasl_language_server_core_1.
|
|
3250
|
+
result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
|
|
3251
|
+
this.typerRemoveNodes.add(targetNodeRaw);
|
|
3230
3252
|
}
|
|
3231
3253
|
}
|
|
3232
3254
|
else {
|
|
3233
|
-
result = (0, nasl_language_server_core_1.
|
|
3234
|
-
}
|
|
3235
|
-
if (result) {
|
|
3236
|
-
result.typerCheckFiles.forEach(file => this.typerCheckFiles.add(file));
|
|
3237
|
-
result.typerRemoveNodes.forEach(node => this.typerRemoveNodes.add(node));
|
|
3238
|
-
result.typerCreateNodes.forEach(node => this.typerCreateNodes.add(node));
|
|
3239
|
-
return true;
|
|
3255
|
+
result = (0, nasl_language_server_core_1.preProcessOther)(this.semEnv, targetNodeRaw, this.typerCheckFiles);
|
|
3240
3256
|
}
|
|
3257
|
+
return result;
|
|
3241
3258
|
}
|
|
3242
3259
|
notifyStartWork() {
|
|
3243
3260
|
this.logger.time('语言服务变更');
|
|
@@ -3262,11 +3279,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3262
3279
|
return { notifyEndWork: endWork };
|
|
3263
3280
|
}
|
|
3264
3281
|
async acquireLock() {
|
|
3265
|
-
|
|
3282
|
+
const old = this.lsRunEnd;
|
|
3266
3283
|
let endChange;
|
|
3267
3284
|
this.lsRunEnd = new Promise((resolve) => {
|
|
3268
3285
|
endChange = resolve;
|
|
3269
3286
|
});
|
|
3287
|
+
// 每个锁的获取依赖前一个锁的释放
|
|
3288
|
+
await old;
|
|
3270
3289
|
return { release: endChange };
|
|
3271
3290
|
}
|
|
3272
3291
|
async flushChangesForTypeChecking() {
|
|
@@ -3280,28 +3299,26 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3280
3299
|
const { changed } = this.processAllEvents(events);
|
|
3281
3300
|
if (changed) {
|
|
3282
3301
|
this.logger.info('triggerTypeChecking 需要进行类型检查');
|
|
3283
|
-
const
|
|
3302
|
+
const oqlCheckFiles = new Set((0, nasl_language_server_core_1.getOqlFiles)(this.semEnv, this.typerCheckFiles, this.typerRemoveNodes));
|
|
3303
|
+
const { tsFilePathsToCheck } = await this.prepareAndWriteTsFilesToCheck(oqlCheckFiles, this.typerRemoveNodes, this.oqlRemoveNodesTsPath);
|
|
3284
3304
|
if (utils.isDebugMode) {
|
|
3285
3305
|
console.log('Little Typer 可能校验以下直接引用文件', this.typerCheckFiles.size, Array.from(this.typerCheckFiles).map((item) => item.nodePath).join('\n'));
|
|
3286
3306
|
console.log('Little Typer 删除以下节点', Array.from(this.typerRemoveNodes).map((item) => item.nodePath).join('\n'));
|
|
3287
3307
|
}
|
|
3288
|
-
// 刷新左侧事件逻辑树，这是额外的耗时、开销
|
|
3289
|
-
this.typerCheckFiles.forEach((nd) => {
|
|
3290
|
-
const isViewLike = nd.concept === 'View' || nd.concept === 'BusinessComponent' || nd.concept === 'ProcessV2';
|
|
3291
|
-
// 删除时，这些节点可能已经不在了，先用个 ?.
|
|
3292
|
-
isViewLike && this.getProxyNode(nd)?.getElementLogicRoot();
|
|
3293
|
-
});
|
|
3294
|
-
// 刷新左侧子逻辑 SubLogics，这是额外的耗时、开销
|
|
3295
|
-
this.typerCheckFiles.forEach((nd) => {
|
|
3296
|
-
const isLogicLike = nd.concept === 'Logic' || nd.concept === 'SubLogic' || nd.concept === 'View'
|
|
3297
|
-
|| nd.concept === 'ProcessElementV2' || nd.concept === 'ProcessV2'
|
|
3298
|
-
|| nd.concept === 'Process' || nd.concept === 'ProcessElement';
|
|
3299
|
-
// @ts-expect-error
|
|
3300
|
-
isLogicLike && (this.getProxyNode(nd))?.getSubLogics();
|
|
3301
|
-
});
|
|
3302
3308
|
const tsDiagnostics = await this.getDiagnosticRecordsAndPushAllAndWaitPublishDiagnosticsEnd(Array.from(tsFilePathsToCheck));
|
|
3303
|
-
const diagRecs = await (0, nasl_language_server_core_1.checkUpdateRefsDiag)(
|
|
3304
|
-
|
|
3309
|
+
const diagRecs = await (0, nasl_language_server_core_1.checkUpdateRefsDiag)({
|
|
3310
|
+
env: this.semEnv,
|
|
3311
|
+
diagMgr: this.diagnosticManager,
|
|
3312
|
+
chkFiles: (0, set_1.union)(this.typerCheckFiles, oqlCheckFiles),
|
|
3313
|
+
removeNodes: this.typerRemoveNodes,
|
|
3314
|
+
createNodes: this.typerCreateNodes,
|
|
3315
|
+
tsDiagnostics,
|
|
3316
|
+
removedConnectors: this.removedConnectors,
|
|
3317
|
+
checkedFiles: new Set()
|
|
3318
|
+
});
|
|
3319
|
+
// 刷新左侧事件逻辑树
|
|
3320
|
+
this._refreshTreeViews();
|
|
3321
|
+
utils.isDebugMode && console.time('\x1b[44m\x1b[97m 6: push all diagnostic records \x1b[0m');
|
|
3305
3322
|
await this.diagnosticManager.pushAll(diagRecs);
|
|
3306
3323
|
this.typerCheckFiles.clear();
|
|
3307
3324
|
this.typerRemoveNodes.clear();
|
|
@@ -3312,7 +3329,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3312
3329
|
this.semEnv.refMgr.qNameDefs.delete(n);
|
|
3313
3330
|
});
|
|
3314
3331
|
this.semEnv.allocatedVEQNames.length = 0;
|
|
3315
|
-
|
|
3332
|
+
this.originProxyTargetNodes.clear();
|
|
3333
|
+
this.removedConnectors.clear();
|
|
3334
|
+
utils.isDebugMode && console.timeEnd('\x1b[44m\x1b[97m 6: push all diagnostic records \x1b[0m');
|
|
3316
3335
|
}
|
|
3317
3336
|
}
|
|
3318
3337
|
catch (err) {
|
|
@@ -3324,6 +3343,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3324
3343
|
}
|
|
3325
3344
|
;
|
|
3326
3345
|
}
|
|
3346
|
+
async getContextVariables(node) {
|
|
3347
|
+
await this.lsRunEnd;
|
|
3348
|
+
return this.semEnv.scopeManager.getContextVariables(node);
|
|
3349
|
+
}
|
|
3327
3350
|
/**
|
|
3328
3351
|
* 获取 Connector 对应 Connector 的properties
|
|
3329
3352
|
*/
|
|
@@ -3471,6 +3494,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3471
3494
|
// console.timeEnd('\x1b[44m\x1b[97m Build SymbolGraph \x1b[0m');
|
|
3472
3495
|
const refMgr = new nasl_language_server_core_1.ReferenceManager();
|
|
3473
3496
|
this.semEnv = new nasl_language_server_core_1.SemEnv(refMgr, utils.isDebugMode);
|
|
3497
|
+
this.semEnv.app = rawApp;
|
|
3474
3498
|
this.semEnv.refMgr.buildQNameDefsForApp(rawApp);
|
|
3475
3499
|
this.semEnv.errorDiagnoser = nasl_language_server_core_1.checker.createErrorDiagnoser({
|
|
3476
3500
|
app: rawApp,
|
|
@@ -3480,7 +3504,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3480
3504
|
debug: !!utils.isDebugMode
|
|
3481
3505
|
});
|
|
3482
3506
|
// this.symbolGraph = null; // 应该能给内存释放掉吧？
|
|
3483
|
-
console.time('\x1b[44m\x1b[97m Collect All Global Definitions \x1b[0m');
|
|
3507
|
+
utils.isDebugMode && console.time('\x1b[44m\x1b[97m Collect All Global Definitions \x1b[0m');
|
|
3484
3508
|
['nasl.util',
|
|
3485
3509
|
'nasl.browser',
|
|
3486
3510
|
'nasl.io',
|
|
@@ -3504,7 +3528,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3504
3528
|
(0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, naslStdlibMap_1.default['nasl.ui.ts']);
|
|
3505
3529
|
this.semEnv.refMgr.buildTsQNameDefs(this.semEnv, 'nasl.ui', naslStdlibMap_1.default['nasl.ui.ts']);
|
|
3506
3530
|
this.semEnv.refMgr.buildTsQNameDefs(this.semEnv, 'nasl.error', naslStdlibMap_1.default['nasl.error.ts']);
|
|
3507
|
-
console.timeEnd('\x1b[44m\x1b[97m Collect All Global Definitions \x1b[0m');
|
|
3531
|
+
utils.isDebugMode && console.timeEnd('\x1b[44m\x1b[97m Collect All Global Definitions \x1b[0m');
|
|
3508
3532
|
// HACK wudengke 临时处理，要求组件库下完之后再进行类型检查
|
|
3509
3533
|
(await this.inited)?.();
|
|
3510
3534
|
//@ts-ignore
|
|
@@ -3528,9 +3552,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3528
3552
|
globalThis.diagnosticApp = () => {
|
|
3529
3553
|
const { clearDiagnostics, getAllDiagnostics } = this.semEnv.errorDiagnoser;
|
|
3530
3554
|
clearDiagnostics();
|
|
3531
|
-
console.time('\x1b[44m\x1b[97m Checker: DiagnosticApp \x1b[0m');
|
|
3555
|
+
utils.isDebugMode && console.time('\x1b[44m\x1b[97m Checker: DiagnosticApp \x1b[0m');
|
|
3532
3556
|
utils.runGeneratorAsync(this.semEnv.errorDiagnoser.diagnosticApp()).then(() => {
|
|
3533
|
-
console.timeEnd('\x1b[44m\x1b[97m Checker: DiagnosticApp \x1b[0m');
|
|
3557
|
+
utils.isDebugMode && console.timeEnd('\x1b[44m\x1b[97m Checker: DiagnosticApp \x1b[0m');
|
|
3534
3558
|
});
|
|
3535
3559
|
return getAllDiagnostics();
|
|
3536
3560
|
};
|
|
@@ -3550,7 +3574,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3550
3574
|
return this.semEnv.errorDiagnoser.getDiagnostics(rowNode);
|
|
3551
3575
|
};
|
|
3552
3576
|
}
|
|
3553
|
-
|
|
3577
|
+
_getAllElementLogicRoots() {
|
|
3554
3578
|
const proxyApp = this.getProxyApp();
|
|
3555
3579
|
const traverseChildrenGetElementLogicRoot = (nd) => {
|
|
3556
3580
|
nd.getElementLogicRoot();
|
|
@@ -3574,6 +3598,38 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3574
3598
|
pv2.getElementLogicRoot();
|
|
3575
3599
|
});
|
|
3576
3600
|
}
|
|
3601
|
+
// 刷新左侧事件逻辑树，名字是 AI 起的
|
|
3602
|
+
_refreshTreeViews() {
|
|
3603
|
+
const uniqueViewLikes = new Set();
|
|
3604
|
+
const uniqueLogicLikes = new Set();
|
|
3605
|
+
const uniqueProcessV2s = new Set();
|
|
3606
|
+
// 收集所有父级节点并去重
|
|
3607
|
+
this.originProxyTargetNodes.forEach((nd) => {
|
|
3608
|
+
const ctxProcessV2 = (0, concepts_1.getCtxProcessLike)(nd)?.getAncestor('ProcessV2');
|
|
3609
|
+
if (ctxProcessV2?.concept === 'ProcessV2') {
|
|
3610
|
+
uniqueProcessV2s.add(ctxProcessV2);
|
|
3611
|
+
}
|
|
3612
|
+
const viewLike = (0, concepts_1.getCtxViewLike)(nd);
|
|
3613
|
+
if (viewLike?.concept === 'View' || viewLike?.concept === 'BusinessComponent') {
|
|
3614
|
+
uniqueViewLikes.add(viewLike);
|
|
3615
|
+
}
|
|
3616
|
+
const ctxLogic = (0, concepts_1.getCtxSubLogicOrLogicLike)(nd);
|
|
3617
|
+
if (ctxLogic?.concept === 'Logic' || ctxLogic?.concept === 'SubLogic') {
|
|
3618
|
+
uniqueLogicLikes.add(ctxLogic);
|
|
3619
|
+
}
|
|
3620
|
+
});
|
|
3621
|
+
// 对去重后的节点执行高耗时操作
|
|
3622
|
+
uniqueViewLikes.forEach((viewLike) => {
|
|
3623
|
+
// 删除时，这些节点可能已经不在了，先用个 ?.
|
|
3624
|
+
viewLike?.getElementLogicRoot();
|
|
3625
|
+
});
|
|
3626
|
+
uniqueLogicLikes.forEach((ctxLogic) => {
|
|
3627
|
+
ctxLogic?.getSubLogics();
|
|
3628
|
+
});
|
|
3629
|
+
uniqueProcessV2s.forEach((ctxProcessV2) => {
|
|
3630
|
+
ctxProcessV2?.getVariablesRoot();
|
|
3631
|
+
});
|
|
3632
|
+
}
|
|
3577
3633
|
};
|
|
3578
3634
|
exports.NaslServer = NaslServer;
|
|
3579
3635
|
__decorate([
|