@lcap/nasl 3.13.1-rc.6 → 3.13.1-rc.7
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/server/OQL/oql-cache.d.ts +7 -1
- package/out/server/OQL/oql-cache.d.ts.map +1 -1
- package/out/server/OQL/oql-cache.js +60 -53
- package/out/server/OQL/oql-cache.js.map +1 -1
- package/out/server/OQL/utils.d.ts +9 -0
- package/out/server/OQL/utils.d.ts.map +1 -1
- package/out/server/OQL/utils.js +28 -1
- package/out/server/OQL/utils.js.map +1 -1
- package/package.json +12 -12
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
import { DataSource, OqlQueryComponent, SyntaxNode } from '@lcap/nasl-concepts';
|
|
2
2
|
import type { AxiosInstance } from 'axios';
|
|
3
3
|
export declare const naslOQLCacheStore: LocalForage;
|
|
4
|
+
type ExtraParams = {
|
|
5
|
+
appId: string;
|
|
6
|
+
ideVersion: string;
|
|
7
|
+
datasourceInfoList: any[];
|
|
8
|
+
};
|
|
4
9
|
export declare function requestEmbeddedTS(this: OqlQueryComponent, dataSourceJSONCache: WeakMap<DataSource, {
|
|
5
10
|
hashCode: string;
|
|
6
11
|
jsonObj: object;
|
|
7
12
|
}>): Promise<void>;
|
|
8
|
-
export declare function requestEmbeddedTSBatch(http: AxiosInstance, oqlList: OqlQueryComponent[]): Promise<void>;
|
|
13
|
+
export declare function requestEmbeddedTSBatch(http: AxiosInstance, oqlList: OqlQueryComponent[], extraParams: ExtraParams): Promise<void>;
|
|
9
14
|
export declare function internalWaitOqlQueryComponentChildrenFinish(node: SyntaxNode, options?: {
|
|
10
15
|
/**
|
|
11
16
|
* 使用批量接口
|
|
12
17
|
*/
|
|
13
18
|
batchMode?: boolean;
|
|
14
19
|
}): Promise<void>;
|
|
20
|
+
export {};
|
|
15
21
|
//# sourceMappingURL=oql-cache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oql-cache.d.ts","sourceRoot":"","sources":["../../../src/server/OQL/oql-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,iBAAiB,EACjB,UAAU,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAW3C,eAAO,MAAM,iBAAiB,aAG5B,CAAC;
|
|
1
|
+
{"version":3,"file":"oql-cache.d.ts","sourceRoot":"","sources":["../../../src/server/OQL/oql-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,iBAAiB,EACjB,UAAU,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAW3C,eAAO,MAAM,iBAAiB,aAG5B,CAAC;AAkCH,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,GAAG,EAAE,CAAC;CAC3B,CAAA;AA4BD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,iBAAiB,EACvB,mBAAmB,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GAC9E,OAAO,CAAC,IAAI,CAAC,CA2Ff;AAqED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,iBAAiB,EAAE,EAC5B,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAsB,2CAA2C,CAC/D,IAAI,EAAE,UAAU,EAChB,OAAO,CAAC,EAAE;IACR;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GACA,OAAO,CAAC,IAAI,CAAC,CAuDf"}
|
|
@@ -18,47 +18,28 @@ exports.naslOQLCacheStore = localforage_1.default.createInstance({
|
|
|
18
18
|
});
|
|
19
19
|
const api = {
|
|
20
20
|
queryDebugTypescript: {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
method: 'post',
|
|
24
|
-
},
|
|
21
|
+
path: '/api/v1/querydebug/generate/typescript',
|
|
22
|
+
method: 'post',
|
|
25
23
|
},
|
|
26
24
|
queryDebugTypescriptBatch: {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
25
|
+
path: '/api/v1/querydebug/generate/typescriptBatch',
|
|
26
|
+
method: 'post',
|
|
27
|
+
},
|
|
28
|
+
typescriptBatchV2: {
|
|
29
|
+
path: '/api/v1/querydebug/generate/typescriptBatch/v2',
|
|
30
|
+
method: 'post',
|
|
31
|
+
},
|
|
32
|
+
typescriptBatchEncodeV2: {
|
|
33
|
+
path: '/api/v1/querydebug/generate/typescriptBatchEncode/v2',
|
|
34
|
+
method: 'post',
|
|
31
35
|
},
|
|
32
36
|
};
|
|
33
37
|
function preparePayloadAndCacheKey(oql) {
|
|
34
38
|
if (oql.code) {
|
|
35
|
-
let dataSourceNasl = oql.app.findNodeByCompleteName(oql.dataSource)?.toJSON();
|
|
36
|
-
if (dataSourceNasl) {
|
|
37
|
-
dataSourceNasl = {
|
|
38
|
-
concept: 'DataSource',
|
|
39
|
-
entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity) => {
|
|
40
|
-
return {
|
|
41
|
-
name: entity.name,
|
|
42
|
-
concept: entity.concept,
|
|
43
|
-
tableName: entity.tableName,
|
|
44
|
-
properties: entity.properties?.map((prop) => {
|
|
45
|
-
return {
|
|
46
|
-
name: prop.name,
|
|
47
|
-
concept: prop.concept,
|
|
48
|
-
columnName: prop.columnName,
|
|
49
|
-
};
|
|
50
|
-
}),
|
|
51
|
-
};
|
|
52
|
-
})),
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
39
|
const payload = {
|
|
56
|
-
appId: oql.app.id,
|
|
57
40
|
oqlIdentifier: 'myoqlIdentifier',
|
|
58
|
-
|
|
41
|
+
datasourceName: oql.dataSource,
|
|
59
42
|
oql: oql.code,
|
|
60
|
-
ideVersion: oql.app.ideVersion,
|
|
61
|
-
dataSourceNasl,
|
|
62
43
|
typeScriptStartLine: 1,
|
|
63
44
|
typeScriptStartLineColumn: 1,
|
|
64
45
|
};
|
|
@@ -134,7 +115,7 @@ async function requestEmbeddedTS(dataSourceJSONCache) {
|
|
|
134
115
|
return res;
|
|
135
116
|
}
|
|
136
117
|
return (0, utils_1.httpRequestConcurrently)(http, {
|
|
137
|
-
url: api.queryDebugTypescript.
|
|
118
|
+
url: api.queryDebugTypescript.path,
|
|
138
119
|
data: params,
|
|
139
120
|
method: 'POST',
|
|
140
121
|
}).then(async (data) => {
|
|
@@ -163,7 +144,18 @@ async function requestEmbeddedTS(dataSourceJSONCache) {
|
|
|
163
144
|
this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
|
|
164
145
|
}
|
|
165
146
|
exports.requestEmbeddedTS = requestEmbeddedTS;
|
|
166
|
-
|
|
147
|
+
function callTypescriptBatchV2(http, oqlGenList, extraParams) {
|
|
148
|
+
const body = Object.assign({ oqlGenList }, extraParams);
|
|
149
|
+
// const body = { gzipBody: getGzipData(Object.assign({ oqlGenList }, extraParams)) };
|
|
150
|
+
return http.post(api.typescriptBatchV2.path, body).then((result) => {
|
|
151
|
+
const { data } = result;
|
|
152
|
+
if (data.code !== 200 || !data.success || !data.result) {
|
|
153
|
+
throw result;
|
|
154
|
+
}
|
|
155
|
+
return data.result;
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
async function makeCachedBatchRequest(http, payloadWithCacheKeyList, extraParams) {
|
|
167
159
|
const itemsWithIndex = payloadWithCacheKeyList.map((item, index) => {
|
|
168
160
|
return { item, index };
|
|
169
161
|
});
|
|
@@ -181,17 +173,9 @@ async function makeCachedBatchRequest(http, payloadWithCacheKeyList) {
|
|
|
181
173
|
for (const { cached, index } of cachedList) {
|
|
182
174
|
resultContainer[index] = cached;
|
|
183
175
|
}
|
|
184
|
-
const
|
|
185
|
-
const tempResultList =
|
|
186
|
-
? await http
|
|
187
|
-
.post(api.queryDebugTypescriptBatch.url.path, paramList)
|
|
188
|
-
.then((result) => {
|
|
189
|
-
const { data } = result;
|
|
190
|
-
if (data.code !== 200 || !data.success || !data.result) {
|
|
191
|
-
throw result;
|
|
192
|
-
}
|
|
193
|
-
return data.result;
|
|
194
|
-
})
|
|
176
|
+
const oqlGenList = notCachedList.map((x) => x.item.payload);
|
|
177
|
+
const tempResultList = (oqlGenList.length > 0)
|
|
178
|
+
? await (0, utils_1.batchApiCall)(http, oqlGenList, callTypescriptBatchV2, extraParams)
|
|
195
179
|
.then(async (resultList = []) => {
|
|
196
180
|
await Promise.all(resultList.map((res, index) => {
|
|
197
181
|
const payload = notCachedList[index];
|
|
@@ -203,18 +187,18 @@ async function makeCachedBatchRequest(http, payloadWithCacheKeyList) {
|
|
|
203
187
|
return resultList;
|
|
204
188
|
})
|
|
205
189
|
: [];
|
|
206
|
-
if (tempResultList.length !==
|
|
190
|
+
if (tempResultList.length !== oqlGenList.length) {
|
|
207
191
|
throw new Error('返回的数据长度不一致');
|
|
208
192
|
}
|
|
209
193
|
return resultContainer;
|
|
210
194
|
}
|
|
211
195
|
// 从服务端获取 SQL -> TS 的翻译和 sourceMap
|
|
212
|
-
async function requestEmbeddedTSBatch(http, oqlList) {
|
|
196
|
+
async function requestEmbeddedTSBatch(http, oqlList, extraParams) {
|
|
213
197
|
const paramList = oqlList.map((oql) => {
|
|
214
198
|
const { cacheKey, payload } = preparePayloadAndCacheKey(oql);
|
|
215
199
|
return { oql, cacheKey, payload };
|
|
216
200
|
});
|
|
217
|
-
return makeCachedBatchRequest(http, paramList)
|
|
201
|
+
return makeCachedBatchRequest(http, paramList, extraParams)
|
|
218
202
|
.then((data) => {
|
|
219
203
|
if (data.length !== oqlList.length) {
|
|
220
204
|
throw new Error('返回的数据长度不一致');
|
|
@@ -231,6 +215,32 @@ async function requestEmbeddedTSBatch(http, oqlList) {
|
|
|
231
215
|
}
|
|
232
216
|
exports.requestEmbeddedTSBatch = requestEmbeddedTSBatch;
|
|
233
217
|
async function internalWaitOqlQueryComponentChildrenFinish(node, options) {
|
|
218
|
+
const app = node.rootNode ?? node;
|
|
219
|
+
const datasourceInfoList = app.dataSources.map((dataSource) => ({
|
|
220
|
+
datasourceName: dataSource.completeName,
|
|
221
|
+
datasource: {
|
|
222
|
+
concept: 'DataSource',
|
|
223
|
+
entities: dataSource.entities?.map((entity) => {
|
|
224
|
+
return {
|
|
225
|
+
name: entity.name,
|
|
226
|
+
concept: entity.concept,
|
|
227
|
+
tableName: entity.tableName,
|
|
228
|
+
properties: entity.properties?.map((prop) => {
|
|
229
|
+
return {
|
|
230
|
+
name: prop.name,
|
|
231
|
+
concept: prop.concept,
|
|
232
|
+
columnName: prop.columnName,
|
|
233
|
+
};
|
|
234
|
+
}),
|
|
235
|
+
};
|
|
236
|
+
}),
|
|
237
|
+
},
|
|
238
|
+
}));
|
|
239
|
+
const extraParams = {
|
|
240
|
+
datasourceInfoList,
|
|
241
|
+
appId: app.id,
|
|
242
|
+
ideVersion: app.ideVersion,
|
|
243
|
+
};
|
|
234
244
|
const oqlList = [];
|
|
235
245
|
node.traverseStrictChildren((el) => {
|
|
236
246
|
if (el.concept === 'OqlQueryComponent') {
|
|
@@ -240,13 +250,10 @@ async function internalWaitOqlQueryComponentChildrenFinish(node, options) {
|
|
|
240
250
|
}
|
|
241
251
|
});
|
|
242
252
|
if (oqlList.length > 0) {
|
|
243
|
-
const http =
|
|
244
|
-
// @ts-expect-error
|
|
245
|
-
// 若是App节点
|
|
246
|
-
node?.naslServer.http;
|
|
253
|
+
const http = app?.naslServer.http;
|
|
247
254
|
if (http) {
|
|
248
255
|
if (options?.batchMode) {
|
|
249
|
-
return requestEmbeddedTSBatch(http, oqlList);
|
|
256
|
+
return requestEmbeddedTSBatch(http, oqlList, extraParams);
|
|
250
257
|
}
|
|
251
258
|
else {
|
|
252
259
|
const dataSourceJSONCache = new WeakMap();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oql-cache.js","sourceRoot":"","sources":["../../../src/server/OQL/oql-cache.ts"],"names":[],"mappings":";;;;;;AAQA,iDAAkE;AAClE,8DAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"oql-cache.js","sourceRoot":"","sources":["../../../src/server/OQL/oql-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
import type { AxiosInstance, AxiosRequestConfig } from 'axios';
|
|
2
2
|
/** 高并发请求 */
|
|
3
3
|
export declare function httpRequestConcurrently<T = any>(axios: AxiosInstance, data: AxiosRequestConfig): Promise<T>;
|
|
4
|
+
/**
|
|
5
|
+
* 分批调用接口并合并结果
|
|
6
|
+
* @param {AxiosInstance} http - 请求实例
|
|
7
|
+
* @param {Array} payloads - 需要处理的完整数据列表
|
|
8
|
+
* @param {Function} apiCallFn - 接口调用函数，接收数据数组作为参数并返回 Promise
|
|
9
|
+
* @param {number} batchSize - 每批次数据量，默认250
|
|
10
|
+
* @returns {Promise<Array>} - 所有批次处理结果合并后的数组
|
|
11
|
+
*/
|
|
12
|
+
export declare function batchApiCall<T, R, P = any>(http: AxiosInstance, payloads: T[], apiCallFn: (http: AxiosInstance, data: T[], params: P) => Promise<R[]>, extraParams: P, batchSize?: number): Promise<R[]>;
|
|
4
13
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/server/OQL/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AA0B/D,YAAY;AACZ,wBAAsB,uBAAuB,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,CAuDjH"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/server/OQL/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AA0B/D,YAAY;AACZ,wBAAsB,uBAAuB,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,CAuDjH;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,SAAS,GAAE,MAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAmBnN"}
|
package/out/server/OQL/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.httpRequestConcurrently = void 0;
|
|
3
|
+
exports.batchApiCall = exports.httpRequestConcurrently = void 0;
|
|
4
4
|
const nasl_utils_1 = require("@lcap/nasl-utils");
|
|
5
5
|
const url_1 = require("url");
|
|
6
6
|
// 浏览器端不支持 undici，必须要屏蔽掉
|
|
@@ -71,4 +71,31 @@ async function httpRequestConcurrently(axios, data) {
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
exports.httpRequestConcurrently = httpRequestConcurrently;
|
|
74
|
+
/**
|
|
75
|
+
* 分批调用接口并合并结果
|
|
76
|
+
* @param {AxiosInstance} http - 请求实例
|
|
77
|
+
* @param {Array} payloads - 需要处理的完整数据列表
|
|
78
|
+
* @param {Function} apiCallFn - 接口调用函数，接收数据数组作为参数并返回 Promise
|
|
79
|
+
* @param {number} batchSize - 每批次数据量，默认250
|
|
80
|
+
* @returns {Promise<Array>} - 所有批次处理结果合并后的数组
|
|
81
|
+
*/
|
|
82
|
+
async function batchApiCall(http, payloads, apiCallFn, extraParams, batchSize = 250) {
|
|
83
|
+
// 如果数据量小于等于批次大小，直接调用接口
|
|
84
|
+
if (payloads.length <= batchSize) {
|
|
85
|
+
return apiCallFn(http, payloads, extraParams);
|
|
86
|
+
}
|
|
87
|
+
// 分批数据
|
|
88
|
+
const batches = [];
|
|
89
|
+
for (let i = 0; i < payloads.length; i += batchSize) {
|
|
90
|
+
batches.push(payloads.slice(i, i + batchSize));
|
|
91
|
+
}
|
|
92
|
+
// 并行调用所有批次
|
|
93
|
+
const results = await Promise.all(batches.map((batch) => {
|
|
94
|
+
return apiCallFn(http, batch, extraParams);
|
|
95
|
+
}));
|
|
96
|
+
return results.reduce((acc, curr) => {
|
|
97
|
+
return acc.concat(curr);
|
|
98
|
+
}, []);
|
|
99
|
+
}
|
|
100
|
+
exports.batchApiCall = batchApiCall;
|
|
74
101
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/server/OQL/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/server/OQL/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.13.1-rc.
|
|
4
|
+
"version": "3.13.1-rc.7",
|
|
5
5
|
"author": "Forrest <rainforest92@126.com>",
|
|
6
6
|
"main": "./out",
|
|
7
7
|
"types": "./out/index.d.ts",
|
|
@@ -74,15 +74,15 @@
|
|
|
74
74
|
"uuid": "8.3.2",
|
|
75
75
|
"validator": "13.7.0",
|
|
76
76
|
"vue-template-compiler": "2.6.14",
|
|
77
|
-
"@lcap/nasl-breakpoint": "3.13.1-rc.
|
|
78
|
-
"@lcap/nasl-concepts": "3.13.1-rc.
|
|
79
|
-
"@lcap/nasl-language-server-core": "3.13.1-rc.
|
|
80
|
-
"@lcap/nasl-log": "3.13.1-rc.
|
|
81
|
-
"@lcap/nasl-sentry": "3.13.1-rc.
|
|
82
|
-
"@lcap/nasl-translator": "3.13.1-rc.
|
|
83
|
-
"@lcap/nasl-types": "3.13.1-rc.
|
|
84
|
-
"@lcap/nasl-unified-frontend-generator": "3.13.1-rc.
|
|
85
|
-
"@lcap/nasl-utils": "3.13.1-rc.
|
|
77
|
+
"@lcap/nasl-breakpoint": "3.13.1-rc.7",
|
|
78
|
+
"@lcap/nasl-concepts": "3.13.1-rc.7",
|
|
79
|
+
"@lcap/nasl-language-server-core": "3.13.1-rc.7",
|
|
80
|
+
"@lcap/nasl-log": "3.13.1-rc.7",
|
|
81
|
+
"@lcap/nasl-sentry": "3.13.1-rc.7",
|
|
82
|
+
"@lcap/nasl-translator": "3.13.1-rc.7",
|
|
83
|
+
"@lcap/nasl-types": "3.13.1-rc.7",
|
|
84
|
+
"@lcap/nasl-unified-frontend-generator": "3.13.1-rc.7",
|
|
85
|
+
"@lcap/nasl-utils": "3.13.1-rc.7"
|
|
86
86
|
},
|
|
87
87
|
"devDependencies": {
|
|
88
88
|
"@types/babel__core": "7.20.1",
|
|
@@ -94,8 +94,8 @@
|
|
|
94
94
|
"rimraf": "3.0.2",
|
|
95
95
|
"typedoc": "0.25.13",
|
|
96
96
|
"typescript": "5.4.4",
|
|
97
|
-
"@lcap/nasl-
|
|
98
|
-
"@lcap/nasl-
|
|
97
|
+
"@lcap/nasl-tsconfig": "1.0.1",
|
|
98
|
+
"@lcap/nasl-test-toolkit": "1.0.0"
|
|
99
99
|
},
|
|
100
100
|
"scripts": {
|
|
101
101
|
"clear": "rimraf ./out",
|