@lcap/nasl 3.8.3-beta.5 → 3.8.3-beta.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/common/utils.d.ts +5 -1
- package/out/common/utils.js +188 -6
- package/out/common/utils.js.map +1 -1
- package/out/concepts/OqlQueryComponent__.d.ts +0 -1
- package/out/concepts/OqlQueryComponent__.js +0 -70
- package/out/concepts/OqlQueryComponent__.js.map +1 -1
- package/out/natural/transformTS2UI.js +1 -1
- package/out/natural/transformTS2UI.js.map +1 -1
- package/out/natural/transforms/transform2LogicItem.js +1 -1
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/server/naslServer.js +3 -0
- package/out/server/naslServer.js.map +1 -1
- package/out/service/logic/api.d.ts +9 -0
- package/out/service/logic/api.js +6 -0
- package/out/service/logic/api.js.map +1 -1
- package/package.json +1 -1
- package/sandbox/stdlib/nasl.collection.ts +3 -3
- package/src/common/utils.ts +227 -5
- package/src/concepts/OqlQueryComponent__.ts +1 -74
- package/src/natural/transformTS2UI.ts +1 -1
- package/src/natural/transforms/transform2LogicItem.ts +1 -1
- package/src/server/naslServer.ts +4 -0
- package/src/service/logic/api.js +6 -0
package/out/common/utils.d.ts
CHANGED
|
@@ -1,2 +1,6 @@
|
|
|
1
|
+
import type { AxiosInstance } from 'axios';
|
|
1
2
|
import type { types } from '../concepts';
|
|
2
|
-
|
|
3
|
+
import OqlQueryComponent from '../concepts/OqlQueryComponent__';
|
|
4
|
+
export declare function requestEmbeddedTS(this: OqlQueryComponent): Promise<void>;
|
|
5
|
+
export declare function requestEmbeddedTSBatch(http: AxiosInstance, oqlList: OqlQueryComponent[]): Promise<void>;
|
|
6
|
+
export declare function waitOqlQueryComponentChildrenFinish(node: types.SyntaxNode): Promise<void>;
|
package/out/common/utils.js
CHANGED
|
@@ -1,17 +1,199 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.waitOqlQueryComponentChildrenFinish = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
+
exports.waitOqlQueryComponentChildrenFinish = exports.requestEmbeddedTSBatch = exports.requestEmbeddedTS = void 0;
|
|
7
|
+
const api_1 = __importDefault(require("../service/logic/api"));
|
|
8
|
+
const nasl_1 = require("../utils/language-cache/nasl");
|
|
9
|
+
function preparePayloadAndCacheKey(oql) {
|
|
10
|
+
if (oql.code) {
|
|
11
|
+
let dataSourceNasl = oql.app.findNodeByCompleteName(oql.dataSource)?.toJSON();
|
|
12
|
+
if (dataSourceNasl) {
|
|
13
|
+
dataSourceNasl = {
|
|
14
|
+
concept: 'DataSource',
|
|
15
|
+
entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity) => {
|
|
16
|
+
return {
|
|
17
|
+
name: entity.name,
|
|
18
|
+
concept: entity.concept,
|
|
19
|
+
tableName: entity.tableName,
|
|
20
|
+
properties: entity.properties?.map((prop) => {
|
|
21
|
+
return {
|
|
22
|
+
name: prop.name,
|
|
23
|
+
concept: prop.concept,
|
|
24
|
+
columnName: prop.columnName,
|
|
25
|
+
};
|
|
26
|
+
}),
|
|
27
|
+
};
|
|
28
|
+
})),
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
const payload = {
|
|
32
|
+
appId: 'myAppId',
|
|
33
|
+
oqlIdentifier: 'myoqlIdentifier',
|
|
34
|
+
dataSourceName: oql.dataSource,
|
|
35
|
+
oql: oql.code,
|
|
36
|
+
ideVersion: oql.app.ideVersion,
|
|
37
|
+
dataSourceNasl,
|
|
38
|
+
typeScriptStartLine: 1,
|
|
39
|
+
typeScriptStartLineColumn: 1,
|
|
40
|
+
};
|
|
41
|
+
return {
|
|
42
|
+
cacheKey: JSON.stringify(payload),
|
|
43
|
+
payload: payload,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
return {
|
|
47
|
+
cacheKey: '',
|
|
48
|
+
payload: null,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
// 从服务端获取 SQL -> TS 的翻译和 sourceMap
|
|
52
|
+
async function requestEmbeddedTS() {
|
|
53
|
+
const { http, logger } = this.rootNode.naslServer;
|
|
54
|
+
if (this.code) {
|
|
55
|
+
let dataSourceNasl = this.app.findNodeByCompleteName(this.dataSource)?.toJSON();
|
|
56
|
+
if (dataSourceNasl) {
|
|
57
|
+
dataSourceNasl = {
|
|
58
|
+
concept: 'DataSource',
|
|
59
|
+
entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity) => {
|
|
60
|
+
return {
|
|
61
|
+
name: entity.name,
|
|
62
|
+
concept: entity.concept,
|
|
63
|
+
tableName: entity.tableName,
|
|
64
|
+
properties: entity.properties?.map((prop) => {
|
|
65
|
+
return {
|
|
66
|
+
name: prop.name,
|
|
67
|
+
concept: prop.concept,
|
|
68
|
+
columnName: prop.columnName,
|
|
69
|
+
};
|
|
70
|
+
}),
|
|
71
|
+
};
|
|
72
|
+
})),
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
const queryWithCache = async () => {
|
|
76
|
+
const params = {
|
|
77
|
+
appId: 'myAppId',
|
|
78
|
+
oqlIdentifier: 'myoqlIdentifier',
|
|
79
|
+
dataSourceName: this.dataSource,
|
|
80
|
+
oql: this.code,
|
|
81
|
+
ideVersion: this.app.ideVersion,
|
|
82
|
+
dataSourceNasl,
|
|
83
|
+
typeScriptStartLine: 1,
|
|
84
|
+
typeScriptStartLineColumn: 1,
|
|
85
|
+
};
|
|
86
|
+
const key = JSON.stringify(params);
|
|
87
|
+
let res = null;
|
|
88
|
+
let canUseCache = false;
|
|
89
|
+
try {
|
|
90
|
+
res = await nasl_1.naslOQLCacheStore.getItem(key);
|
|
91
|
+
canUseCache = true;
|
|
92
|
+
}
|
|
93
|
+
catch (error) { }
|
|
94
|
+
if (res !== null) {
|
|
95
|
+
return res;
|
|
96
|
+
}
|
|
97
|
+
return http.post(api_1.default.queryDebugTypescript.url.path, params).then(async ({ data }) => {
|
|
98
|
+
if (canUseCache) {
|
|
99
|
+
try {
|
|
100
|
+
await nasl_1.naslOQLCacheStore.setItem(key, data);
|
|
101
|
+
}
|
|
102
|
+
catch (error) { }
|
|
103
|
+
}
|
|
104
|
+
return data;
|
|
105
|
+
});
|
|
106
|
+
};
|
|
107
|
+
return queryWithCache()
|
|
108
|
+
.then((data) => {
|
|
109
|
+
this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
|
|
110
|
+
})
|
|
111
|
+
.catch((err) => {
|
|
112
|
+
logger.error('Oql 请求失败', err.toString());
|
|
113
|
+
this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
|
|
117
|
+
}
|
|
118
|
+
exports.requestEmbeddedTS = requestEmbeddedTS;
|
|
119
|
+
async function makeCachedBatchRequest(http, payloadWithCacheKeyList) {
|
|
120
|
+
const itemsWithIndex = payloadWithCacheKeyList.map((item, index) => {
|
|
121
|
+
return { item, index };
|
|
122
|
+
});
|
|
123
|
+
const cacheTest = await Promise.all(itemsWithIndex.map(async ({ item, index }) => {
|
|
124
|
+
const cached = await nasl_1.naslOQLCacheStore.getItem(item.cacheKey);
|
|
125
|
+
return { item, index, cached };
|
|
126
|
+
}));
|
|
127
|
+
const notCachedList = cacheTest.filter((x) => !x.cached);
|
|
128
|
+
const cachedList = cacheTest.filter((x) => x.cached);
|
|
129
|
+
const resultContainer = Array.from({
|
|
130
|
+
length: payloadWithCacheKeyList.length,
|
|
131
|
+
}).fill(null);
|
|
132
|
+
for (const { cached, index } of cachedList) {
|
|
133
|
+
resultContainer[index] = cached;
|
|
134
|
+
}
|
|
135
|
+
const paramList = notCachedList.map((x) => x.item.payload);
|
|
136
|
+
const tempResultList = paramList.length
|
|
137
|
+
? await http
|
|
138
|
+
.post(api_1.default.queryDebugTypescriptBatch.url.path, paramList)
|
|
139
|
+
.then((x) => x.data.result)
|
|
140
|
+
.then(async (resultList) => {
|
|
141
|
+
await Promise.all(resultList.map((res, index) => {
|
|
142
|
+
const payload = notCachedList[index];
|
|
143
|
+
resultContainer[payload.index] = res;
|
|
144
|
+
return nasl_1.naslOQLCacheStore.setItem(payload.item.cacheKey, res);
|
|
145
|
+
}));
|
|
146
|
+
return resultList;
|
|
147
|
+
})
|
|
148
|
+
: [];
|
|
149
|
+
if (tempResultList.length !== paramList.length) {
|
|
150
|
+
throw new Error('返回的数据长度不一致');
|
|
151
|
+
}
|
|
152
|
+
return resultContainer;
|
|
153
|
+
}
|
|
154
|
+
// 从服务端获取 SQL -> TS 的翻译和 sourceMap
|
|
155
|
+
async function requestEmbeddedTSBatch(http, oqlList) {
|
|
156
|
+
const paramList = oqlList.map((oql) => {
|
|
157
|
+
const { cacheKey, payload } = preparePayloadAndCacheKey(oql);
|
|
158
|
+
return { oql, cacheKey, payload };
|
|
159
|
+
});
|
|
160
|
+
return makeCachedBatchRequest(http, paramList)
|
|
161
|
+
.then((data) => {
|
|
162
|
+
if (data.length !== oqlList.length) {
|
|
163
|
+
throw new Error('返回的数据长度不一致');
|
|
164
|
+
}
|
|
165
|
+
data.forEach((item, index) => {
|
|
166
|
+
const targetOql = oqlList[index];
|
|
167
|
+
targetOql.codeSourceMap = item ?? { typescript: '', lexicalErrorCode: 1001 };
|
|
168
|
+
});
|
|
169
|
+
})
|
|
170
|
+
.catch((err) => {
|
|
171
|
+
// TODO wudengke logger
|
|
172
|
+
console.error('Oql 请求失败', err.toString());
|
|
173
|
+
console.error(err);
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
exports.requestEmbeddedTSBatch = requestEmbeddedTSBatch;
|
|
177
|
+
async function waitOqlQueryComponentChildrenFinish(node) {
|
|
178
|
+
const oqlList = [];
|
|
6
179
|
node.traverseStrictChildren((el) => {
|
|
7
180
|
if (el.concept === 'OqlQueryComponent') {
|
|
8
181
|
if (!el.codeSourceMap) {
|
|
9
|
-
|
|
182
|
+
oqlList.push(el);
|
|
10
183
|
}
|
|
11
184
|
}
|
|
12
185
|
});
|
|
13
|
-
if (
|
|
14
|
-
|
|
186
|
+
if (oqlList.length > 0) {
|
|
187
|
+
const http = node.rootNode?.naslServer.http ??
|
|
188
|
+
// @ts-expect-error
|
|
189
|
+
// 若是App节点
|
|
190
|
+
node?.naslServer.http;
|
|
191
|
+
if (http) {
|
|
192
|
+
return requestEmbeddedTSBatch(http, oqlList);
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
throw new Error('http client 不存在');
|
|
196
|
+
}
|
|
15
197
|
}
|
|
16
198
|
}
|
|
17
199
|
exports.waitOqlQueryComponentChildrenFinish = waitOqlQueryComponentChildrenFinish;
|
package/out/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;;;;AAKA,+DAAuC;AACvC,uDAAiE;AAkBjE,SAAS,yBAAyB,CAAC,GAAsB;IACvD,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,IAAI,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAC9E,IAAI,cAAc,EAAE;YAClB,cAAc,GAAG;gBACf,OAAO,EAAE,YAAY;gBACrB,QAAQ,EAAE,CAAC,cAAc,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE;oBACnF,OAAO;wBACL,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,IAAoB,EAAE,EAAE;4BAC1D,OAAO;gCACL,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,OAAO,EAAE,IAAI,CAAC,OAAO;gCACrB,UAAU,EAAE,IAAI,CAAC,UAAU;6BAC5B,CAAC;wBACJ,CAAC,CAAC;qBACH,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ,CAAC;SACH;QACD,MAAM,OAAO,GAAgC;YAC3C,KAAK,EAAE,SAAS;YAChB,aAAa,EAAE,iBAAiB;YAChC,cAAc,EAAE,GAAG,CAAC,UAAU;YAC9B,GAAG,EAAE,GAAG,CAAC,IAAI;YACb,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,UAAU;YAC9B,cAAc;YACd,mBAAmB,EAAE,CAAC;YACtB,yBAAyB,EAAE,CAAC;SAC7B,CAAC;QACF,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACjC,OAAO,EAAE,OAAO;SACjB,CAAC;KACH;IACD,OAAO;QACL,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAOD,kCAAkC;AAC3B,KAAK,UAAU,iBAAiB;IACrC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAElD,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,IAAI,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAChF,IAAI,cAAc,EAAE;YAClB,cAAc,GAAG;gBACf,OAAO,EAAE,YAAY;gBACrB,QAAQ,EAAE,CAAC,cAAc,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE;oBACnF,OAAO;wBACL,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,IAAoB,EAAE,EAAE;4BAC1D,OAAO;gCACL,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,OAAO,EAAE,IAAI,CAAC,OAAO;gCACrB,UAAU,EAAE,IAAI,CAAC,UAAU;6BAC5B,CAAC;wBACJ,CAAC,CAAC;qBACH,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ,CAAC;SACH;QAED,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;YAChC,MAAM,MAAM,GAAG;gBACb,KAAK,EAAE,SAAS;gBAChB,aAAa,EAAE,iBAAiB;gBAChC,cAAc,EAAE,IAAI,CAAC,UAAU;gBAC/B,GAAG,EAAE,IAAI,CAAC,IAAI;gBACd,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU;gBAC/B,cAAc;gBACd,mBAAmB,EAAE,CAAC;gBACtB,yBAAyB,EAAE,CAAC;aAC7B,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,IAAI,CAAC;YACf,IAAI,WAAW,GAAG,KAAK,CAAC;YACxB,IAAI;gBACF,GAAG,GAAG,MAAM,wBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC3C,WAAW,GAAG,IAAI,CAAC;aACpB;YAAC,OAAO,KAAK,EAAE,GAAE;YAClB,IAAI,GAAG,KAAK,IAAI,EAAE;gBAChB,OAAO,GAAG,CAAC;aACZ;YACD,OAAO,IAAI,CAAC,IAAI,CAAC,aAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBAClF,IAAI,WAAW,EAAE;oBACf,IAAI;wBACF,MAAM,wBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;qBAC5C;oBAAC,OAAO,KAAK,EAAE,GAAE;iBACnB;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,OAAO,cAAc,EAAE;aACpB,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE;YAClB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;QACjF,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;QAClE,CAAC,CAAC,CAAC;KACN;IACD,IAAI,CAAC,aAAa,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;AAClE,CAAC;AAlED,8CAkEC;AAED,KAAK,UAAU,sBAAsB,CACnC,IAAmB,EACnB,uBAA8C;IAE9C,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACjE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3C,MAAM,MAAM,GAA+B,MAAM,wBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1F,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACjC,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAErD,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAA6B;QAC7D,MAAM,EAAE,uBAAuB,CAAC,MAAM;KACvC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,KAAK,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,UAAU,EAAE;QAC1C,eAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;KACjC;IACD,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAmC,SAAS,CAAC,MAAM;QACrE,CAAC,CAAC,MAAM,IAAI;aACP,IAAI,CAAC,aAAG,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC;aACvD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;aAC1B,IAAI,CAAC,KAAK,EAAE,UAA0C,EAAE,EAAE;YACzD,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC5B,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;gBACrC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;gBACrC,OAAO,wBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC/D,CAAC,CAAC,CACH,CAAC;YACF,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC;QACN,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,cAAc,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE;QAC9C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;KAC/B;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,kCAAkC;AAC3B,KAAK,UAAU,sBAAsB,CAC1C,IAAmB,EACnB,OAA4B;IAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACpC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC;QAC7D,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,OAAO,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC;SAC3C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;SAC/B;QACD,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YACjC,SAAS,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;QAC/E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,uBAAuB;QACvB,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;AACP,CAAC;AAxBD,wDAwBC;AAEM,KAAK,UAAU,mCAAmC,CAAC,IAAsB;IAC9E,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,EAAE,EAAE;QACjC,IAAI,EAAE,CAAC,OAAO,KAAK,mBAAmB,EAAE;YACtC,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE;gBACrB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAClB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,GACR,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI;YAC9B,mBAAmB;YACnB,UAAU;YACV,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;QACxB,IAAI,IAAI,EAAE;YACR,OAAO,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC9C;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;SACpC;KACF;AACH,CAAC;AAvBD,kFAuBC"}
|
|
@@ -55,7 +55,6 @@ export declare class OqlQueryComponent extends LogicItem {
|
|
|
55
55
|
toEmbeddedTS(state?: TranslatorState): TranslatorGenerator;
|
|
56
56
|
toNaturalTS(state?: TranslatorState): string;
|
|
57
57
|
toTextualNASL(state?: TranslatorState): string;
|
|
58
|
-
requestEmbeddedTS(): Promise<any>;
|
|
59
58
|
/**
|
|
60
59
|
* 获取添加时的默认选项
|
|
61
60
|
* @returns
|
|
@@ -13,7 +13,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.OqlQueryComponent = void 0;
|
|
14
14
|
const time_slicing_1 = require("../utils/time-slicing");
|
|
15
15
|
const translator_1 = require("../translator");
|
|
16
|
-
const nasl_1 = require("../utils/language-cache/nasl");
|
|
17
16
|
const decorators_1 = require("../decorators");
|
|
18
17
|
const LogicItem__1 = __importDefault(require("./LogicItem__"));
|
|
19
18
|
/**
|
|
@@ -218,75 +217,6 @@ let OqlQueryComponent = OqlQueryComponent_1 = class OqlQueryComponent extends Lo
|
|
|
218
217
|
.replace(/"/g, '\\"'); // 处理枚举 TS 转不回来的情况 ${app.enums.NetStatusEnum.1}
|
|
219
218
|
return `sql"${code}"`;
|
|
220
219
|
}
|
|
221
|
-
// 从服务端获取 SQL -> TS 的翻译和 sourceMap
|
|
222
|
-
async requestEmbeddedTS() {
|
|
223
|
-
const { http, logger } = this.rootNode.naslServer;
|
|
224
|
-
if (this.code) {
|
|
225
|
-
let dataSourceNasl = this.app.findNodeByCompleteName(this.dataSource)?.toJSON();
|
|
226
|
-
if (dataSourceNasl) {
|
|
227
|
-
dataSourceNasl = {
|
|
228
|
-
concept: 'DataSource',
|
|
229
|
-
entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity) => {
|
|
230
|
-
return {
|
|
231
|
-
name: entity.name,
|
|
232
|
-
concept: entity.concept,
|
|
233
|
-
tableName: entity.tableName,
|
|
234
|
-
properties: entity.properties?.map((prop) => {
|
|
235
|
-
return {
|
|
236
|
-
name: prop.name,
|
|
237
|
-
concept: prop.concept,
|
|
238
|
-
columnName: prop.columnName,
|
|
239
|
-
};
|
|
240
|
-
}),
|
|
241
|
-
};
|
|
242
|
-
})),
|
|
243
|
-
};
|
|
244
|
-
}
|
|
245
|
-
const query = async () => {
|
|
246
|
-
const params = {
|
|
247
|
-
appId: 'myAppId',
|
|
248
|
-
oqlIdentifier: 'myoqlIdentifier',
|
|
249
|
-
dataSourceName: this.dataSource,
|
|
250
|
-
oql: this.code,
|
|
251
|
-
ideVersion: this.app.ideVersion,
|
|
252
|
-
dataSourceNasl,
|
|
253
|
-
typeScriptStartLine: 1,
|
|
254
|
-
typeScriptStartLineColumn: 1,
|
|
255
|
-
};
|
|
256
|
-
const key = JSON.stringify(params);
|
|
257
|
-
let res = null;
|
|
258
|
-
let canUseCache = false;
|
|
259
|
-
try {
|
|
260
|
-
res = await nasl_1.naslOQLCacheStore.getItem(key);
|
|
261
|
-
canUseCache = true;
|
|
262
|
-
}
|
|
263
|
-
catch (error) { }
|
|
264
|
-
if (res !== null) {
|
|
265
|
-
return res;
|
|
266
|
-
}
|
|
267
|
-
return http
|
|
268
|
-
.post('/api/v1/querydebug/generate/typescript', params)
|
|
269
|
-
.then(async ({ data }) => {
|
|
270
|
-
if (canUseCache) {
|
|
271
|
-
try {
|
|
272
|
-
await nasl_1.naslOQLCacheStore.setItem(key, data);
|
|
273
|
-
}
|
|
274
|
-
catch (error) { }
|
|
275
|
-
}
|
|
276
|
-
return data;
|
|
277
|
-
});
|
|
278
|
-
};
|
|
279
|
-
return query()
|
|
280
|
-
.then((data) => {
|
|
281
|
-
this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
|
|
282
|
-
})
|
|
283
|
-
.catch((err) => {
|
|
284
|
-
logger.error('Oql 请求失败', err.toString());
|
|
285
|
-
this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
|
|
286
|
-
});
|
|
287
|
-
}
|
|
288
|
-
this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
|
|
289
|
-
}
|
|
290
220
|
/**
|
|
291
221
|
* 获取添加时的默认选项
|
|
292
222
|
* @returns
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OqlQueryComponent__.js","sourceRoot":"","sources":["../../src/concepts/OqlQueryComponent__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAA8E;AAC9E,8CASuB;
|
|
1
|
+
{"version":3,"file":"OqlQueryComponent__.js","sourceRoot":"","sources":["../../src/concepts/OqlQueryComponent__.ts"],"names":[],"mappings":"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"}
|
|
@@ -1053,7 +1053,7 @@ function transformNode2Logic(node, name, type) {
|
|
|
1053
1053
|
if (logicItem) {
|
|
1054
1054
|
if (logicItem.concept === 'Variable') {
|
|
1055
1055
|
if (!curLogic.variables.find((_) => _.name === logicItem.name))
|
|
1056
|
-
curLogic.addVariable(logicItem);
|
|
1056
|
+
curLogic.addVariable({ ...logicItem, defaultValue: undefined });
|
|
1057
1057
|
logicItem = new utils_1.naslTypes.Assignment({
|
|
1058
1058
|
left: new utils_1.naslTypes.Identifier({ name: logicItem?.name }),
|
|
1059
1059
|
right: logicItem.defaultValue?.expression || '',
|