@lcap/nasl 4.1.0-beta.4 → 4.1.0-beta.6
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 +3 -23
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/release-body/body.d.ts +3 -1
- package/out/generator/release-body/body.d.ts.map +1 -1
- package/out/generator/release-body/body.js +393 -389
- package/out/generator/release-body/body.js.map +1 -1
- package/out/generator/release-body/data.d.ts +2 -0
- package/out/generator/release-body/data.d.ts.map +1 -1
- package/out/generator/release-body/data.js +55 -38
- package/out/generator/release-body/data.js.map +1 -1
- package/out/generator/release-body/index.d.ts +1 -0
- package/out/generator/release-body/index.d.ts.map +1 -1
- package/out/generator/release-body/index.js +1 -0
- package/out/generator/release-body/index.js.map +1 -1
- package/out/generator/release-body/memory-optimization.d.ts +47 -0
- package/out/generator/release-body/memory-optimization.d.ts.map +1 -0
- package/out/generator/release-body/memory-optimization.js +266 -0
- package/out/generator/release-body/memory-optimization.js.map +1 -0
- package/out/generator/release-body/utils.d.ts +11 -4
- package/out/generator/release-body/utils.d.ts.map +1 -1
- package/out/generator/release-body/utils.js +52 -20
- package/out/generator/release-body/utils.js.map +1 -1
- package/out/natural/transforms/transform2LogicItem.d.ts.map +1 -1
- package/out/natural/transforms/transform2LogicItem.js +5 -0
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/server/extendBaseNode.js +1 -1
- package/out/server/extendBaseNode.js.map +1 -1
- package/out/server/findReference.d.ts.map +1 -1
- package/out/server/findReference.js +5 -1
- package/out/server/findReference.js.map +1 -1
- package/out/server/index.d.ts +0 -1
- package/out/server/index.d.ts.map +1 -1
- package/out/server/index.js +1 -2
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +4 -11
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +30 -64
- package/out/server/naslServer.js.map +1 -1
- package/out/templator/utils.d.ts.map +1 -1
- package/out/templator/utils.js +1 -0
- package/out/templator/utils.js.map +1 -1
- package/package.json +13 -14
- package/sandbox/stdlib/nasl.util.ts +18 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findReference.d.ts","sourceRoot":"","sources":["../../src/server/findReference.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,QAAQ,EAaX,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EACH,UAAU,EAEV,MAAM,EAET,MAAM,iCAAiC,CAAC;AAIzC,KAAK,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAGrD,eAAO,MAAM,sBAAsB,WAAkB,MAAM,UAAU,UAAU,
|
|
1
|
+
{"version":3,"file":"findReference.d.ts","sourceRoot":"","sources":["../../src/server/findReference.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,QAAQ,EAaX,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EACH,UAAU,EAEV,MAAM,EAET,MAAM,iCAAiC,CAAC;AAIzC,KAAK,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAGrD,eAAO,MAAM,sBAAsB,WAAkB,MAAM,UAAU,UAAU,2BA4C9E,CAAA;AAID,eAAO,MAAM,WAAW,YAAa,QAAQ,UAAU,IAAI,QAAQ,EAAE,MAAM,MAAM,SAAS,CAAC,CAAC,CAAC,WAAW,IAAI,QAAQ,EAAE,SAAS,CAAC,SAgF7H,CAAA;AAGH,eAAO,MAAM,aAAa,WAAY,IAAI,QAAQ,EAAE,MAAM,MAAM,SAAS,CAAC,CAAC,CAAC,kBAQ3E,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,eAAgB,MAAM,MAAM,SAAS,CAAC,CAAC,cAuBlE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,SAAU,SAAS,OAAO,IAAI,SAAS,EAAE,MAAM,SAAS,CAAC,CAAC,cAM5F,CAAA"}
|
|
@@ -39,12 +39,16 @@ const findReferenceAndRender = async (semEnv, __node) => {
|
|
|
39
39
|
}
|
|
40
40
|
return false;
|
|
41
41
|
};
|
|
42
|
-
let node = __node;
|
|
42
|
+
let node = toRaw(__node);
|
|
43
43
|
if (isVirtualNode(__node)) {
|
|
44
44
|
node = semEnv.refMgr.getNodeDef(__node);
|
|
45
45
|
}
|
|
46
46
|
utils.isDebugMode && console.time('\x1b[44m\x1b[97m Find references: find \x1b[0m');
|
|
47
47
|
let refs = toRaw(semEnv.refMgr).getReferences(semEnv, node);
|
|
48
|
+
// 产品上的功能：事件逻辑的 查找引用 能看到自己
|
|
49
|
+
if (node.parentNode?.concept === 'BindEvent') {
|
|
50
|
+
refs.push(node);
|
|
51
|
+
}
|
|
48
52
|
// 不显示实体逻辑里的引用
|
|
49
53
|
refs = refs.filter(ref => !(0, nasl_language_server_core_1.isEntityLogic)((0, service_1.getFileNode)(ref)));
|
|
50
54
|
utils.isDebugMode && console.timeEnd('\x1b[44m\x1b[97m Find references: find \x1b[0m');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findReference.js","sourceRoot":"","sources":["../../src/server/findReference.ts"],"names":[],"mappings":";AAAA,+CAA+C;AAC/C,0CAA0C;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1C,0CAcqB;AAIrB,gDAAkC;AAElC,+EAKyC;AAEzC,yDAA0D;AAI1D,wBAAwB;AACjB,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAkB,EAAE,EAAE;IAC/E,uBAAuB;IACvB,MAAM,aAAa,GAAG,CAAC,EAAc,EAAE,EAAE;QACrC,IAAI,EAAE,CAAC,OAAO,KAAK,OAAO,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAA;IAED,IAAI,IAAI,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"findReference.js","sourceRoot":"","sources":["../../src/server/findReference.ts"],"names":[],"mappings":"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"}
|
package/out/server/index.d.ts
CHANGED
|
@@ -21,7 +21,6 @@ declare const server: {
|
|
|
21
21
|
getValidates: typeof service.getValidates;
|
|
22
22
|
getValidateFunction: typeof service.getValidateFunction;
|
|
23
23
|
getSelectNextCompletionData: typeof service.getSelectNextCompletionData;
|
|
24
|
-
getVariableIdentifier: typeof service.getVariableIdentifier;
|
|
25
24
|
getEnumsIdentifier: typeof service.getEnumsIdentifier;
|
|
26
25
|
getCommonVariableIdentifier: typeof service.getCommonVariableIdentifier;
|
|
27
26
|
getBackendVariablesIdentifier: typeof service.getBackendVariablesIdentifier;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C;;;;GAIG;AACH,QAAA,MAAM,MAAM
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C;;;;GAIG;AACH,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;CAwBX,CAAC;AAEF,eAAe,MAAM,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}
|
package/out/server/index.js
CHANGED
|
@@ -20,11 +20,10 @@ const server = {
|
|
|
20
20
|
getProcessComponents: nasl_concepts_1.service.getProcessComponents,
|
|
21
21
|
getProcessComponent: nasl_concepts_1.service.getProcessComponent,
|
|
22
22
|
getMemberIdentifier: nasl_concepts_1.service.getMemberIdentifier,
|
|
23
|
-
getVarCompletionList: nasl_concepts_1.service.getVarCompletionList,
|
|
23
|
+
getVarCompletionList: nasl_concepts_1.service.getVarCompletionList,
|
|
24
24
|
getValidates: nasl_concepts_1.service.getValidates,
|
|
25
25
|
getValidateFunction: nasl_concepts_1.service.getValidateFunction,
|
|
26
26
|
getSelectNextCompletionData: nasl_concepts_1.service.getSelectNextCompletionData,
|
|
27
|
-
getVariableIdentifier: nasl_concepts_1.service.getVariableIdentifier,
|
|
28
27
|
getEnumsIdentifier: nasl_concepts_1.service.getEnumsIdentifier,
|
|
29
28
|
getCommonVariableIdentifier: nasl_concepts_1.service.getCommonVariableIdentifier,
|
|
30
29
|
getBackendVariablesIdentifier: nasl_concepts_1.service.getBackendVariablesIdentifier,
|
package/out/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,6CAAuD;AAEvD,uDAA8C;AAE9C;;;;GAIG;AACH,MAAM,MAAM,GAAG;IACb,uBAAuB,EAAvB,oCAAuB;IACvB,aAAa,EAAE,uBAAO,CAAC,aAAa;IACpC,SAAS,EAAE,uBAAO,CAAC,SAAS;IAC5B,YAAY,EAAE,uBAAO,CAAC,YAAY;IAClC,aAAa,EAAE,uBAAO,CAAC,aAAa;IACpC,YAAY,EAAE,uBAAO,CAAC,YAAY;IAClC,kBAAkB,EAAE,uBAAO,CAAC,kBAAkB;IAC9C,oBAAoB,EAAE,uBAAO,CAAC,oBAAoB;IAClD,mBAAmB,EAAE,uBAAO,CAAC,mBAAmB;IAChD,mBAAmB,EAAE,uBAAO,CAAC,mBAAmB;IAChD,oBAAoB,EAAE,uBAAO,CAAC,oBAAoB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,6CAAuD;AAEvD,uDAA8C;AAE9C;;;;GAIG;AACH,MAAM,MAAM,GAAG;IACb,uBAAuB,EAAvB,oCAAuB;IACvB,aAAa,EAAE,uBAAO,CAAC,aAAa;IACpC,SAAS,EAAE,uBAAO,CAAC,SAAS;IAC5B,YAAY,EAAE,uBAAO,CAAC,YAAY;IAClC,aAAa,EAAE,uBAAO,CAAC,aAAa;IACpC,YAAY,EAAE,uBAAO,CAAC,YAAY;IAClC,kBAAkB,EAAE,uBAAO,CAAC,kBAAkB;IAC9C,oBAAoB,EAAE,uBAAO,CAAC,oBAAoB;IAClD,mBAAmB,EAAE,uBAAO,CAAC,mBAAmB;IAChD,mBAAmB,EAAE,uBAAO,CAAC,mBAAmB;IAChD,oBAAoB,EAAE,uBAAO,CAAC,oBAAoB;IAClD,YAAY,EAAE,uBAAO,CAAC,YAAY;IAClC,mBAAmB,EAAE,uBAAO,CAAC,mBAAmB;IAChD,2BAA2B,EAAE,uBAAO,CAAC,2BAA2B;IAChE,kBAAkB,EAAE,uBAAO,CAAC,kBAAkB;IAC9C,2BAA2B,EAAE,uBAAO,CAAC,2BAA2B;IAChE,6BAA6B,EAAE,uBAAO,CAAC,6BAA6B;IACpE,qBAAqB,EAAE,uBAAO,CAAC,qBAAqB;IACpD,UAAU,EAAE,uBAAO,CAAC,UAAU;IAC9B,4BAA4B,EAAE,uBAAO,CAAC,4BAA4B;IAClE,oBAAoB,EAAE,uBAAO,CAAC,oBAAoB;IAClD,gBAAgB,EAAE,uBAAO,CAAC,gBAAgB;IAC1C,gBAAgB,EAAE,uBAAO,CAAC,gBAAgB;CAC3C,CAAC;AAEF,kBAAe,MAAM,CAAC;AACtB,2CAA0C;AAAjC,wGAAA,UAAU,OAAA"}
|
|
@@ -18,7 +18,7 @@ type SharedAppVersion = {
|
|
|
18
18
|
ideVersion: string;
|
|
19
19
|
};
|
|
20
20
|
import { SemanticData } from '@lcap/nasl-concepts';
|
|
21
|
-
import { ConcreteOQLDiagnostic, SymbolGraph,
|
|
21
|
+
import { ConcreteOQLDiagnostic, SymbolGraph, DefConcept, SemEnv } from '@lcap/nasl-language-server-core';
|
|
22
22
|
type IsHaveRefResultType = {
|
|
23
23
|
node: SyntaxNode;
|
|
24
24
|
fileNode: SyntaxNode;
|
|
@@ -267,6 +267,9 @@ declare class NaslServer {
|
|
|
267
267
|
*
|
|
268
268
|
* @description FIXME: 保留旧的逻辑，验证完成之后需要删除
|
|
269
269
|
*/
|
|
270
|
+
/**
|
|
271
|
+
* @warning 主要是 rename 等内部调用的查找引用，不是用户点击的 "查找引用"
|
|
272
|
+
*/
|
|
270
273
|
_isHaveRef(__node: SyntaxNode): Promise<IsHaveRefResultType[]>;
|
|
271
274
|
/**
|
|
272
275
|
* 查找引用，并且做一些 修改前的准备工作，
|
|
@@ -401,16 +404,6 @@ declare class NaslServer {
|
|
|
401
404
|
} & SyntaxNode;
|
|
402
405
|
currentSource?: undefined;
|
|
403
406
|
};
|
|
404
|
-
/**
|
|
405
|
-
* 获取节点引用
|
|
406
|
-
*
|
|
407
|
-
* @param {SyntaxNode} node 查询的节点
|
|
408
|
-
* @param {SyntaxNode} [fileNode] 节点所属的文件节点，外部输入可以省去计算
|
|
409
|
-
*/
|
|
410
|
-
getReferences(node: SyntaxNode, fileNode?: SyntaxNode): {
|
|
411
|
-
node: RefConcept;
|
|
412
|
-
fileNode: SyntaxNode;
|
|
413
|
-
}[];
|
|
414
407
|
/**
|
|
415
408
|
* 获取节点引用，不包括自己
|
|
416
409
|
*
|
|
@@ -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,EAS1B,MAAM,aAAa,CAAC;AAyBrB,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;
|
|
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
|
@@ -49,6 +49,7 @@ const concepts_1 = require("../concepts");
|
|
|
49
49
|
const asserts_1 = require("@lcap/nasl-concepts/asserts");
|
|
50
50
|
const service_1 = require("@lcap/nasl-concepts/service");
|
|
51
51
|
const utils = __importStar(require("../utils"));
|
|
52
|
+
const memory_optimization_1 = require("../generator/release-body/memory-optimization");
|
|
52
53
|
const createUiTs_1 = __importStar(require("./createUiTs"));
|
|
53
54
|
const translator_1 = require("../translator");
|
|
54
55
|
const translator_2 = require("./translator");
|
|
@@ -371,7 +372,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
371
372
|
// 目前里面包含所有定义、逻辑、业务组件、前端全局变量等
|
|
372
373
|
fixAllUseBeforeAssignTasks = await (0, nasl_language_server_core_1.firstScreenCheckAndCompare)(this.semEnv, rawApp);
|
|
373
374
|
// 类型检查完才能收集引用
|
|
374
|
-
this.semEnv.refMgr.buildSymbolRefsForApp(this.semEnv, rawApp
|
|
375
|
+
this.semEnv.refMgr.buildSymbolRefsForApp(this.semEnv, rawApp);
|
|
375
376
|
}
|
|
376
377
|
catch (err) {
|
|
377
378
|
this.semEnv.logger.fatal('\x1b[44m\x1b[97m 类型检查出错了，估计没标完 \x1b[0m');
|
|
@@ -1614,7 +1615,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
1614
1615
|
// // this.logger.info(refsList, 'refsList');
|
|
1615
1616
|
// return refsList;
|
|
1616
1617
|
// }
|
|
1617
|
-
|
|
1618
|
+
/**
|
|
1619
|
+
* @warning 主要是 rename 等内部调用的查找引用，不是用户点击的 "查找引用"
|
|
1620
|
+
*/
|
|
1618
1621
|
async _isHaveRef(__node) {
|
|
1619
1622
|
const wrapRefs = (refs) => {
|
|
1620
1623
|
const result = [];
|
|
@@ -1642,35 +1645,30 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
1642
1645
|
return [];
|
|
1643
1646
|
}
|
|
1644
1647
|
const { parentNode } = nd;
|
|
1645
|
-
|
|
1646
|
-
|
|
1647
|
-
|
|
1648
|
-
|
|
1649
|
-
result.push(...wrapRefs(this.semEnv.refMgr.getReferences(this.semEnv, l)));
|
|
1650
|
-
}
|
|
1651
|
-
}
|
|
1652
|
-
else if (nd.concept === 'ViewElement') {
|
|
1653
|
-
const refMemAddrs = this.semEnv.refMgr.getViewElementRefs(this.semEnv, nd);
|
|
1648
|
+
const semEnv = NaslServer_1.toRaw(this.semEnv);
|
|
1649
|
+
let result = wrapRefs(semEnv.refMgr.getReferences(semEnv, nd));
|
|
1650
|
+
if (nd.concept === 'ViewElement') {
|
|
1651
|
+
const refMemAddrs = semEnv.refMgr.getViewElementRefs(semEnv, nd);
|
|
1654
1652
|
result.push(...wrapRefs(refMemAddrs));
|
|
1655
1653
|
}
|
|
1656
1654
|
else if (nd.concept === 'ProcessElementV2') {
|
|
1657
|
-
const refMemAddrs =
|
|
1655
|
+
const refMemAddrs = semEnv.refMgr.getProcessElementRefs(semEnv, nd);
|
|
1658
1656
|
result.push(...wrapRefs(refMemAddrs));
|
|
1659
1657
|
}
|
|
1660
1658
|
else if (nd.concept === 'DataSource') {
|
|
1661
1659
|
for (const entity of nd.entities) {
|
|
1662
|
-
const ettRefs =
|
|
1660
|
+
const ettRefs = semEnv.refMgr.getReferences(semEnv, entity);
|
|
1663
1661
|
result.push(...wrapRefs(ettRefs));
|
|
1664
1662
|
for (const l of entity.logics) {
|
|
1665
|
-
result.push(...wrapRefs(
|
|
1663
|
+
result.push(...wrapRefs(semEnv.refMgr.getReferences(semEnv, l)));
|
|
1666
1664
|
}
|
|
1667
1665
|
}
|
|
1668
1666
|
}
|
|
1669
1667
|
else if (concepts_1.asserts.isStrictParam(nd)) {
|
|
1670
1668
|
// 调用处的 keyword = XXX 等也要修改，所以查 Logic、View 等的引用
|
|
1671
1669
|
const pNode = NaslServer_1.toRaw(parentNode);
|
|
1672
|
-
if (
|
|
1673
|
-
const refs =
|
|
1670
|
+
if ((0, nasl_language_server_core_1.isCallableNaslLogic)(pNode) || concepts_1.asserts.isStrictView(pNode)) {
|
|
1671
|
+
const refs = semEnv.refMgr.getReferences(semEnv, pNode);
|
|
1674
1672
|
result.push(...wrapRefs(refs));
|
|
1675
1673
|
}
|
|
1676
1674
|
}
|
|
@@ -2621,32 +2619,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2621
2619
|
// 不用 TS LS 的最新类型，用现有类型直接写入 NASL json
|
|
2622
2620
|
async fastGetNaslAnnotatedJSON(naslNode) {
|
|
2623
2621
|
// eslint-disable-next-line @typescript-eslint/no-shadow
|
|
2624
|
-
const isApp = concepts_1.asserts.isApp(naslNode);
|
|
2625
2622
|
if (this.changeStackList?.length) {
|
|
2626
2623
|
throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
|
|
2627
2624
|
}
|
|
2628
2625
|
this.logger.time('app to AnnotatedJSON');
|
|
2629
|
-
|
|
2630
|
-
|
|
2631
|
-
// 不知道为什么实体的（国际化、流程）枚举的默认值的 expr 和 expr.object 和 expr.property 都没标类型，但是逻辑变量的默认值就标了
|
|
2632
|
-
// 不标类型，服务端就认为是用户自定义枚举，然后 import 一个奇怪的文件，就挂了
|
|
2633
|
-
// Enum1.prop，怎么想 prop 也不应该标 Enum1 类型啊，现在就得是 prop、Enum1、Enum1.prop 都标成 Enum1 类型……
|
|
2634
|
-
const fixEnumDefValTypesInEntity = (app) => {
|
|
2635
|
-
app.dataSources.forEach(ds => ds.entities.forEach(ett => {
|
|
2636
|
-
ett.properties.forEach(prop => {
|
|
2637
|
-
// @ts-ignore
|
|
2638
|
-
if (isSysEnum(prop.defaultValue?.expression?.object?.namespace)) {
|
|
2639
|
-
const ty = prop.typeAnnotation;
|
|
2640
|
-
const memExp = prop.defaultValue.expression;
|
|
2641
|
-
memExp.__TypeAnnotation = ty;
|
|
2642
|
-
memExp.object.__TypeAnnotation = ty;
|
|
2643
|
-
memExp.property.__TypeAnnotation = ty;
|
|
2644
|
-
}
|
|
2645
|
-
});
|
|
2646
|
-
}));
|
|
2647
|
-
};
|
|
2648
|
-
fixEnumDefValTypesInEntity(naslNode);
|
|
2649
|
-
}
|
|
2626
|
+
// 重置优化统计信息
|
|
2627
|
+
(0, memory_optimization_1.resetOptimizationStats)();
|
|
2650
2628
|
const timeZoneArgumentIndexMap = new Map([
|
|
2651
2629
|
['ToString', 1],
|
|
2652
2630
|
['CurrDateTime', 0],
|
|
@@ -2695,8 +2673,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2695
2673
|
// Do not write redundant type annotation for TypeAnnotation concept.
|
|
2696
2674
|
return;
|
|
2697
2675
|
}
|
|
2698
|
-
//
|
|
2699
|
-
|
|
2676
|
+
// 集成内存优化：在标注过程中直接优化JSON，减少内存使用和处理时间
|
|
2677
|
+
(0, memory_optimization_1.optimizeJsonDuringAnnotation)(newJson);
|
|
2700
2678
|
let tyAnn = tyAnnToJSON(this.semEnv.getType(oldNd));
|
|
2701
2679
|
if ((oldNd.concept === 'Variable' || oldNd.concept === 'Return' || oldNd.concept === 'Param')
|
|
2702
2680
|
&& !oldNd.typeAnnotation
|
|
@@ -2818,10 +2796,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
2818
2796
|
};
|
|
2819
2797
|
const json = NaslServer_1.toRaw(naslNode)._toJSON(doWork, preWork, postWork);
|
|
2820
2798
|
this.logger.timeEnd('app to AnnotatedJSON');
|
|
2821
|
-
//
|
|
2822
|
-
|
|
2823
|
-
|
|
2824
|
-
|
|
2799
|
+
// 输出内存优化统计信息
|
|
2800
|
+
const stats = (0, memory_optimization_1.getOptimizationStats)();
|
|
2801
|
+
console.log('内存优化统计', {
|
|
2802
|
+
节点处理数量: stats.totalCalls,
|
|
2803
|
+
删除的属性: stats.propertiesRemoved,
|
|
2804
|
+
删除的空数组: stats.emptyArraysRemoved,
|
|
2805
|
+
删除的undefined值: stats.undefinedValuesRemoved,
|
|
2806
|
+
总优化项: stats.propertiesRemoved + stats.emptyArraysRemoved + stats.undefinedValuesRemoved
|
|
2807
|
+
});
|
|
2825
2808
|
return json;
|
|
2826
2809
|
}
|
|
2827
2810
|
/**
|
|
@@ -3449,26 +3432,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3449
3432
|
}
|
|
3450
3433
|
}
|
|
3451
3434
|
}
|
|
3452
|
-
/**
|
|
3453
|
-
* 获取节点引用
|
|
3454
|
-
*
|
|
3455
|
-
* @param {SyntaxNode} node 查询的节点
|
|
3456
|
-
* @param {SyntaxNode} [fileNode] 节点所属的文件节点，外部输入可以省去计算
|
|
3457
|
-
*/
|
|
3458
|
-
getReferences(node, fileNode = (0, service_1.getFileNode)(node)) {
|
|
3459
|
-
const refList = this.semEnv.refMgr.getReferences(this.semEnv, node)
|
|
3460
|
-
.map((item) => ({ node: item, fileNode: (0, service_1.getFileNode)(item) })) // 我搞不定了，再说吧……
|
|
3461
|
-
.filter((item) => item.fileNode && !item.fileNode.nodePath.includes('[-1]'));
|
|
3462
|
-
const fileNodeRefList = this.semEnv.refMgr.getReferences(this.semEnv, fileNode)
|
|
3463
|
-
.map((item) => ({ node: item, fileNode: (0, service_1.getFileNode)(item) })) // 我搞不定了，再说吧……
|
|
3464
|
-
.filter((item) => item.fileNode && !item.fileNode.nodePath.includes('[-1]'));
|
|
3465
|
-
// 引用要包含自身
|
|
3466
|
-
refList.push({ node: node, fileNode });
|
|
3467
|
-
return [
|
|
3468
|
-
...refList,
|
|
3469
|
-
...fileNodeRefList,
|
|
3470
|
-
];
|
|
3471
|
-
}
|
|
3472
3435
|
/**
|
|
3473
3436
|
* 获取节点引用，不包括自己
|
|
3474
3437
|
*
|
|
@@ -3622,12 +3585,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
3622
3585
|
uniqueViewLikes.forEach((viewLike) => {
|
|
3623
3586
|
// 删除时，这些节点可能已经不在了，先用个 ?.
|
|
3624
3587
|
viewLike?.getElementLogicRoot();
|
|
3588
|
+
viewLike.concept === 'View' && viewLike?.getSubLogics();
|
|
3625
3589
|
});
|
|
3626
3590
|
uniqueLogicLikes.forEach((ctxLogic) => {
|
|
3627
3591
|
ctxLogic?.getSubLogics();
|
|
3628
3592
|
});
|
|
3629
3593
|
uniqueProcessV2s.forEach((ctxProcessV2) => {
|
|
3630
3594
|
ctxProcessV2?.getVariablesRoot();
|
|
3595
|
+
ctxProcessV2?.getElementLogicRoot();
|
|
3596
|
+
ctxProcessV2?.getSubLogics();
|
|
3631
3597
|
});
|
|
3632
3598
|
}
|
|
3633
3599
|
};
|