@lcap/nasl 3.9.2-beta.1 → 3.9.2-beta.3
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/annotation/incremental.d.ts +2 -0
- package/out/generator/annotation/incremental.d.ts.map +1 -1
- package/out/generator/annotation/incremental.js +18 -2
- package/out/generator/annotation/incremental.js.map +1 -1
- package/out/generator/annotation/types.d.ts +8 -0
- package/out/generator/annotation/types.d.ts.map +1 -1
- package/out/generator/annotation/types.js +10 -0
- package/out/generator/annotation/types.js.map +1 -1
- package/out/generator/annotation/utils.d.ts +5 -0
- package/out/generator/annotation/utils.d.ts.map +1 -1
- package/out/generator/annotation/utils.js +29 -1
- package/out/generator/annotation/utils.js.map +1 -1
- package/package.json +11 -11
|
@@ -3,5 +3,7 @@ import { ModuleGraphData } from '@lcap/nasl-language-server-core';
|
|
|
3
3
|
import { NaslServer } from '../../server';
|
|
4
4
|
import { IncrementalAnnotationResult } from './types';
|
|
5
5
|
/** 增量标注 */
|
|
6
|
+
export declare function incrementalAnnotationByCacheBase(app: App, server: NaslServer, naslCacheData: object, moduleGraphCache: ModuleGraphData, logger?: import("@lcap/nasl-types").Logger): Promise<IncrementalAnnotationResult>;
|
|
7
|
+
/** 增量标注 */
|
|
6
8
|
export declare function incrementalAnnotationByCache(app: App, server: NaslServer, naslCacheData: object, moduleGraphCache: ModuleGraphData, logger?: import("@lcap/nasl-types").Logger): Promise<IncrementalAnnotationResult>;
|
|
7
9
|
//# sourceMappingURL=incremental.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incremental.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAc,MAAM,qBAAqB,CAAC;AAQtD,OAAO,EAEL,eAAe,EAGhB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"incremental.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAc,MAAM,qBAAqB,CAAC;AAQtD,OAAO,EAEL,eAAe,EAGhB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EAAE,2BAA2B,EAAwB,MAAM,SAAS,CAAC;AAG5E,WAAW;AACX,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,eAAe,EACjC,MAAM,oCAAiB,GACtB,OAAO,CAAC,2BAA2B,CAAC,CAiMtC;AAED,WAAW;AACX,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,eAAe,EACjC,MAAM,oCAAiB,GACtB,OAAO,CAAC,2BAA2B,CAAC,CAQtC"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.incrementalAnnotationByCache = void 0;
|
|
3
|
+
exports.incrementalAnnotationByCache = exports.incrementalAnnotationByCacheBase = void 0;
|
|
4
4
|
const nasl_concepts_1 = require("@lcap/nasl-concepts");
|
|
5
5
|
const nasl_utils_1 = require("@lcap/nasl-utils");
|
|
6
6
|
const service_1 = require("@lcap/nasl-concepts/service");
|
|
7
7
|
const nasl_language_server_core_1 = require("@lcap/nasl-language-server-core");
|
|
8
8
|
const patch_1 = require("./patch");
|
|
9
|
+
const full_1 = require("./full");
|
|
10
|
+
const types_1 = require("./types");
|
|
9
11
|
const utils_1 = require("./utils");
|
|
10
12
|
/** 增量标注 */
|
|
11
|
-
async function
|
|
13
|
+
async function incrementalAnnotationByCacheBase(app, server, naslCacheData, moduleGraphCache, logger = nasl_utils_1.internalLogger) {
|
|
12
14
|
await logger.info(utils_1.LogEventName, '开始进行增量标注');
|
|
13
15
|
const naslCache = nasl_concepts_1.App.createSilenceApp(naslCacheData);
|
|
14
16
|
await logger.info(utils_1.LogEventName, 'Nasl 缓存实例化结束');
|
|
@@ -100,6 +102,9 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
|
|
|
100
102
|
let currentModuleCount = 0;
|
|
101
103
|
const modules = await moduleGraph.topologicalSort({
|
|
102
104
|
async getModulesSignature(modules, getModuleStatus) {
|
|
105
|
+
if (modules.length === 0) {
|
|
106
|
+
throw types_1.IncrementalErrorCode.CircularModule;
|
|
107
|
+
}
|
|
103
108
|
/** 当前的 TS 文件 */
|
|
104
109
|
const tsFiles = [];
|
|
105
110
|
/** 待标注的节点 */
|
|
@@ -164,5 +169,16 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
|
|
|
164
169
|
isSkipFrontendGenerator: !modules.some((mod) => (0, utils_1.isFrontendNode)(mod.node)),
|
|
165
170
|
};
|
|
166
171
|
}
|
|
172
|
+
exports.incrementalAnnotationByCacheBase = incrementalAnnotationByCacheBase;
|
|
173
|
+
/** 增量标注 */
|
|
174
|
+
function incrementalAnnotationByCache(app, server, naslCacheData, moduleGraphCache, logger = nasl_utils_1.internalLogger) {
|
|
175
|
+
return incrementalAnnotationByCacheBase(app, server, naslCacheData, moduleGraphCache, logger)
|
|
176
|
+
.catch(async (error) => {
|
|
177
|
+
const errorData = (0, utils_1.getErrorMessage)(error);
|
|
178
|
+
await logger.error(`ErrorCode ${errorData.code}`, errorData.message);
|
|
179
|
+
await logger.info(`操作回退`, '回退至全量标注...');
|
|
180
|
+
return (0, full_1.getFullAnnotationAndModuleGraph)(app, server, logger);
|
|
181
|
+
});
|
|
182
|
+
}
|
|
167
183
|
exports.incrementalAnnotationByCache = incrementalAnnotationByCache;
|
|
168
184
|
//# sourceMappingURL=incremental.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incremental.js","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":";;;AAAA,uDAAsD;AACtD,iDAAqE;AACrE,yDAKqC;AACrC,+EAKyC;
|
|
1
|
+
{"version":3,"file":"incremental.js","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
import { ModuleGraphData } from '@lcap/nasl-language-server-core';
|
|
2
|
+
export declare enum IncrementalErrorCode {
|
|
3
|
+
/** 循环引用模块 */
|
|
4
|
+
CircularModule = 100,
|
|
5
|
+
/** 运行时错误 */
|
|
6
|
+
Runtime = 200,
|
|
7
|
+
/** 未知错误 */
|
|
8
|
+
Unknown = 999
|
|
9
|
+
}
|
|
2
10
|
export interface IncrementalAnnotationResult {
|
|
3
11
|
/** 标注数据 */
|
|
4
12
|
annotationData: object;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,MAAM,WAAW,2BAA2B;IAC1C,WAAW;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY;IACZ,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW;IACX,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe;IACf,uBAAuB,EAAE,OAAO,CAAC;CAClC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,oBAAY,oBAAoB;IAC9B,aAAa;IACb,cAAc,MAAM;IACpB,YAAY;IACZ,OAAO,MAAM;IACb,WAAW;IACX,OAAO,MAAM;CACd;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY;IACZ,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW;IACX,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe;IACf,uBAAuB,EAAE,OAAO,CAAC;CAClC"}
|
|
@@ -1,3 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.IncrementalErrorCode = void 0;
|
|
4
|
+
var IncrementalErrorCode;
|
|
5
|
+
(function (IncrementalErrorCode) {
|
|
6
|
+
/** 循环引用模块 */
|
|
7
|
+
IncrementalErrorCode[IncrementalErrorCode["CircularModule"] = 100] = "CircularModule";
|
|
8
|
+
/** 运行时错误 */
|
|
9
|
+
IncrementalErrorCode[IncrementalErrorCode["Runtime"] = 200] = "Runtime";
|
|
10
|
+
/** 未知错误 */
|
|
11
|
+
IncrementalErrorCode[IncrementalErrorCode["Unknown"] = 999] = "Unknown";
|
|
12
|
+
})(IncrementalErrorCode || (exports.IncrementalErrorCode = IncrementalErrorCode = {}));
|
|
3
13
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/generator/annotation/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/generator/annotation/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,oBAOX;AAPD,WAAY,oBAAoB;IAC9B,aAAa;IACb,qFAAoB,CAAA;IACpB,YAAY;IACZ,uEAAa,CAAA;IACb,WAAW;IACX,uEAAa,CAAA;AACf,CAAC,EAPW,oBAAoB,oCAApB,oBAAoB,QAO/B"}
|
|
@@ -11,4 +11,9 @@ export declare function createModuleGraphByAnnotation(data: object | App): impor
|
|
|
11
11
|
export declare function moduleGraphCacheToMap(data: ModuleGraphData): Map<string, ModuleData>;
|
|
12
12
|
/** 是前端节点 */
|
|
13
13
|
export declare function isFrontendNode(node: SyntaxNode): boolean;
|
|
14
|
+
/** 获取错误文本 */
|
|
15
|
+
export declare function getErrorMessage(err: unknown): {
|
|
16
|
+
code: number;
|
|
17
|
+
message: string;
|
|
18
|
+
};
|
|
14
19
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAe,UAAU,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAE3F,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,KAAK,UAAU,EAAG,KAAK,GAAG,EAAW,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAe,UAAU,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAE3F,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,KAAK,UAAU,EAAG,KAAK,GAAG,EAAW,MAAM,qBAAqB,CAAC;AAG1E,eAAO,MAAM,YAAY,gBAAgB,CAAC;AAE1C,oBAAoB;AACpB,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,oCAAiB,uBAajH;AAED,gBAAgB;AAChB,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,yDAU/D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAQpF;AAED,YAAY;AACZ,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,WAO9C;AAED,aAAa;AACb,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO;;;EAyB3C"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isFrontendNode = exports.moduleGraphCacheToMap = exports.createModuleGraphByAnnotation = exports.createNaslServer = exports.LogEventName = void 0;
|
|
3
|
+
exports.getErrorMessage = exports.isFrontendNode = exports.moduleGraphCacheToMap = exports.createModuleGraphByAnnotation = exports.createNaslServer = exports.LogEventName = void 0;
|
|
4
4
|
const nasl_utils_1 = require("@lcap/nasl-utils");
|
|
5
5
|
const nasl_language_server_core_1 = require("@lcap/nasl-language-server-core");
|
|
6
6
|
const server_1 = require("../../server");
|
|
7
7
|
const config_1 = require("../../config");
|
|
8
8
|
const nasl_concepts_1 = require("@lcap/nasl-concepts");
|
|
9
|
+
const types_1 = require("./types");
|
|
9
10
|
exports.LogEventName = 'Nasl Server';
|
|
10
11
|
/** 生成 NaslServer */
|
|
11
12
|
async function createNaslServer(axios, uiData, logger = nasl_utils_1.internalLogger) {
|
|
@@ -49,4 +50,31 @@ function isFrontendNode(node) {
|
|
|
49
50
|
nasl_concepts_1.asserts.isStrictBusinessComponent(node));
|
|
50
51
|
}
|
|
51
52
|
exports.isFrontendNode = isFrontendNode;
|
|
53
|
+
/** 获取错误文本 */
|
|
54
|
+
function getErrorMessage(err) {
|
|
55
|
+
const msg = {
|
|
56
|
+
[types_1.IncrementalErrorCode.CircularModule]: '发现未处理的循环引用',
|
|
57
|
+
[types_1.IncrementalErrorCode.Runtime]: '运行时错误',
|
|
58
|
+
[types_1.IncrementalErrorCode.Unknown]: '未知错误',
|
|
59
|
+
};
|
|
60
|
+
if (typeof err === 'number' && msg[err]) {
|
|
61
|
+
return {
|
|
62
|
+
code: err,
|
|
63
|
+
message: msg[err],
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
else if (err instanceof Error) {
|
|
67
|
+
return {
|
|
68
|
+
code: types_1.IncrementalErrorCode.Runtime,
|
|
69
|
+
message: (err.stack ?? err.message ?? err.toString()),
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
return {
|
|
74
|
+
code: types_1.IncrementalErrorCode.Unknown,
|
|
75
|
+
message: err,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
exports.getErrorMessage = getErrorMessage;
|
|
52
80
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":";;;AAEA,iDAAkD;AAClD,+EAA2F;AAE3F,yCAA0C;AAC1C,yCAAsC;AACtC,uDAA0E;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lcap/nasl",
|
|
3
3
|
"description": "NetEase Application Specific Language",
|
|
4
|
-
"version": "3.9.2-beta.
|
|
4
|
+
"version": "3.9.2-beta.3",
|
|
5
5
|
"author": "Forrest <rainforest92@126.com>",
|
|
6
6
|
"main": "./out",
|
|
7
7
|
"types": "./out/index.d.ts",
|
|
@@ -70,16 +70,16 @@
|
|
|
70
70
|
"socket.io-client": "2.4.0",
|
|
71
71
|
"uuid": "8.3.2",
|
|
72
72
|
"vue-template-compiler": "2.6.14",
|
|
73
|
-
"@lcap/nasl-breakpoint": "3.9.2-beta.
|
|
74
|
-
"@lcap/nasl-concepts": "3.9.2-beta.
|
|
75
|
-
"@lcap/nasl-language-server-core": "3.9.2-beta.
|
|
76
|
-
"@lcap/nasl-log": "3.9.2-beta.
|
|
77
|
-
"@lcap/nasl-sentry": "3.9.2-beta.
|
|
78
|
-
"@lcap/nasl-translator": "3.9.2-beta.
|
|
79
|
-
"@lcap/nasl-types": "3.9.2-beta.
|
|
80
|
-
"@lcap/nasl-typescript-worker": "3.9.2-beta.
|
|
81
|
-
"@lcap/nasl-unified-frontend-generator": "3.9.2-beta.
|
|
82
|
-
"@lcap/nasl-utils": "3.9.2-beta.
|
|
73
|
+
"@lcap/nasl-breakpoint": "3.9.2-beta.3",
|
|
74
|
+
"@lcap/nasl-concepts": "3.9.2-beta.3",
|
|
75
|
+
"@lcap/nasl-language-server-core": "3.9.2-beta.3",
|
|
76
|
+
"@lcap/nasl-log": "3.9.2-beta.3",
|
|
77
|
+
"@lcap/nasl-sentry": "3.9.2-beta.3",
|
|
78
|
+
"@lcap/nasl-translator": "3.9.2-beta.3",
|
|
79
|
+
"@lcap/nasl-types": "3.9.2-beta.3",
|
|
80
|
+
"@lcap/nasl-typescript-worker": "3.9.2-beta.3",
|
|
81
|
+
"@lcap/nasl-unified-frontend-generator": "3.9.2-beta.3",
|
|
82
|
+
"@lcap/nasl-utils": "3.9.2-beta.3"
|
|
83
83
|
},
|
|
84
84
|
"devDependencies": {
|
|
85
85
|
"@types/babel__core": "7.20.1",
|