@lcap/nasl 3.8.2-alpha.3 → 3.8.2-alpha.4
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/natural/getContext/getUILib.js +4 -1
- package/out/natural/getContext/getUILib.js.map +1 -1
- package/out/natural/tools.d.ts +8 -0
- package/out/natural/tools.js +53 -2
- package/out/natural/tools.js.map +1 -1
- package/package.json +1 -1
- package/src/natural/getContext/getUILib.ts +4 -1
- package/src/natural/tools.ts +51 -1
|
@@ -72,7 +72,10 @@ function handleMaterial({ json, tsDeclaration }) {
|
|
|
72
72
|
snippets.forEach((code) => {
|
|
73
73
|
const cap = code.match(/class ([a-zA-Z]+).+?extends ViewComponent/);
|
|
74
74
|
if (cap) {
|
|
75
|
-
|
|
75
|
+
const newCode = code
|
|
76
|
+
.replace(/nasl\.core\./g, "")
|
|
77
|
+
.replace(/Integer/g, "Long");
|
|
78
|
+
snippetMap[cap[1]] = `declare namespace nasl.ui${newCode}`;
|
|
76
79
|
}
|
|
77
80
|
});
|
|
78
81
|
json.forEach((item) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUILib.js","sourceRoot":"","sources":["../../../src/natural/getContext/getUILib.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,iDAA+D;AAC/D,0DAA4C;AAC5C,mDAAqC;AAErC,SAAgB,QAAQ,CAAC,YAAyB;IAChD,IAAI,WAAgB,CAAC;IACrB,IAAI,SAAc,CAAC;IACnB,2CAA2C;IAC3C,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,eAAe;QACvC,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACzB,WAAW,GAAG;YACZ,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,iDAAiD,CAAC,EAAE,MAAM,CAAC;YAC/F,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,iDAAiD,CAAC,EAAE,MAAM,CAAC;SAChG,CAAC;QACF,SAAS,GAAG;YACV,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,iDAAiD,CAAC,EAAE,MAAM,CAAC;YAC/F,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,iDAAiD,CAAC,EAAE,MAAM,CAAC;SAChG,CAAC;KACH;IACD,UAAU;IACV,2CAA2C;IAC3C,IAAI,UAAU,CAAC,MAAM,EAAE,EAAE,eAAe;QACtC,WAAW,GAAG;YACZ,EAAE,EAAE,OAAO,CAAC,8DAA8D,CAAC,CAAC,OAAO;YACnF,EAAE,EAAE,OAAO,CAAC,8DAA8D,CAAC,CAAC,OAAO;SACpF,CAAC;QACF,SAAS,GAAG;YACV,EAAE,EAAE,OAAO,CAAC,8DAA8D,CAAC,CAAC,OAAO;YACnF,EAAE,EAAE,OAAO,CAAC,8DAA8D,CAAC,CAAC,OAAO;SACpF,CAAC;KACH;IACD,UAAU;IAEV,IAAI,IAAI,GAAQ,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IACtD,IAAI,aAAa,GAAW,SAAS,CAAC,YAAY,CAAC,CAAC;IAEpD,OAAO,cAAc,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;AACjD,CAAC;AAjCD,4BAiCC;AAED,SAAgB,cAAc,CAAC,EAAE,IAAI,EAAE,aAAa,EAAkG;IACpJ,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,kDAAkD,EAAE,EAAE,CAAC;SAC1F,OAAO,CAAC,wBAAwB,EAAE,YAAY,CAAC;SAC/C,OAAO,CAAC,8BAA8B,EAAE,YAAY,CAAC;SACrD,OAAO,CAAC,0BAA0B,EAAE,gBAAgB,CAAC;SACrD,OAAO,CAAC,0BAA0B,EAAE,eAAe,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAClE,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QACpE,IAAI,GAAG,EAAE;YACP,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,4BAA4B,
|
|
1
|
+
{"version":3,"file":"getUILib.js","sourceRoot":"","sources":["../../../src/natural/getContext/getUILib.ts"],"names":[],"mappings":"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"}
|
package/out/natural/tools.d.ts
CHANGED
|
@@ -17,3 +17,11 @@ export declare const getUnImportedModulesForLogic: (json: BaseNode, app: App, ma
|
|
|
17
17
|
export declare const deduceType: (app: App, activeDesignerNode: any) => Promise<{
|
|
18
18
|
typeMap: any;
|
|
19
19
|
}>;
|
|
20
|
+
/**
|
|
21
|
+
* 组合所有的可推导类型
|
|
22
|
+
* @param app: 当前应用
|
|
23
|
+
* @returns 推导类型集合
|
|
24
|
+
*/
|
|
25
|
+
export declare const deduceTypeAll: (app: App) => Promise<{
|
|
26
|
+
typeMapAll: any;
|
|
27
|
+
}>;
|
package/out/natural/tools.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.deduceType = exports.getUnImportedModulesForLogic = exports.getUsedModule = exports.getLogicType = void 0;
|
|
26
|
+
exports.deduceTypeAll = exports.deduceType = exports.getUnImportedModulesForLogic = exports.getUsedModule = exports.getLogicType = void 0;
|
|
27
27
|
const utils = __importStar(require("../utils"));
|
|
28
28
|
const translator_1 = require("../translator");
|
|
29
29
|
// 获取当前逻辑的类型
|
|
@@ -173,7 +173,8 @@ const deduceType = async (app, activeDesignerNode) => {
|
|
|
173
173
|
if (logic?.returns?.length && !logic.name.startsWith('LCAP')) {
|
|
174
174
|
const ret = logic.returns[0];
|
|
175
175
|
const typeAnnotation = ret?.typeAnnotation || ret?.__TypeAnnotation;
|
|
176
|
-
|
|
176
|
+
if (typeAnnotation)
|
|
177
|
+
typeMap[ret.nodePath] = typeAnnotation.toNaturalTS(state);
|
|
177
178
|
}
|
|
178
179
|
});
|
|
179
180
|
const params = activeDesignerNode?.params.concat(activeDesignerNode?.virtualParams || []);
|
|
@@ -210,4 +211,54 @@ const deduceType = async (app, activeDesignerNode) => {
|
|
|
210
211
|
return { typeMap };
|
|
211
212
|
};
|
|
212
213
|
exports.deduceType = deduceType;
|
|
214
|
+
/**
|
|
215
|
+
* 组合所有的可推导类型
|
|
216
|
+
* @param app: 当前应用
|
|
217
|
+
* @returns 推导类型集合
|
|
218
|
+
*/
|
|
219
|
+
const deduceTypeAll = async (app) => {
|
|
220
|
+
const typeMap = {};
|
|
221
|
+
const { logics } = app;
|
|
222
|
+
const state = (0, translator_1.createCompilerState)('', { descriptionComment: true, needNamespace: true });
|
|
223
|
+
logics.forEach((logic) => {
|
|
224
|
+
if (logic?.returns?.length && !logic.name.startsWith('LCAP')) {
|
|
225
|
+
const ret = logic.returns[0];
|
|
226
|
+
const typeAnnotation = ret?.typeAnnotation || ret?.__TypeAnnotation;
|
|
227
|
+
if (typeAnnotation)
|
|
228
|
+
typeMap[ret.nodePath] = typeAnnotation.toNaturalTS(state);
|
|
229
|
+
}
|
|
230
|
+
});
|
|
231
|
+
const dataSchemaMap = {};
|
|
232
|
+
utils.traverse(({ node }) => {
|
|
233
|
+
if (node?.concept === 'ViewElement') {
|
|
234
|
+
const dataSchema = node.bindAttrs.find((_) => _.name === 'dataSchema');
|
|
235
|
+
if (dataSchema)
|
|
236
|
+
dataSchemaMap[dataSchema.nodePath] = node;
|
|
237
|
+
}
|
|
238
|
+
if (node?.concept === 'Logic' && node?.parentNode?.concept === 'BindEvent') {
|
|
239
|
+
const params = node?.params.concat(node?.virtualParams || []);
|
|
240
|
+
if (params?.length) {
|
|
241
|
+
let code = '';
|
|
242
|
+
params?.forEach((param, index) => {
|
|
243
|
+
if (param.name === 'event')
|
|
244
|
+
code += 'event';
|
|
245
|
+
else
|
|
246
|
+
code += param.toNaturalTS(state);
|
|
247
|
+
if (index !== params.length - 1)
|
|
248
|
+
code += ', ';
|
|
249
|
+
});
|
|
250
|
+
typeMap[node.nodePath] = code;
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
}, { node: app }, { mode: 'onlyArray' });
|
|
254
|
+
await Promise.all(Object.entries(dataSchemaMap).map(async ([nodePath, node]) => {
|
|
255
|
+
const res = await app.naslServer.getDataSchemaStructureOrTypeAnnotation(node);
|
|
256
|
+
if (res) {
|
|
257
|
+
const dataSchemaTs = res.toNaturalTS(state);
|
|
258
|
+
typeMap[nodePath] = dataSchemaTs;
|
|
259
|
+
}
|
|
260
|
+
}));
|
|
261
|
+
return { typeMapAll: typeMap };
|
|
262
|
+
};
|
|
263
|
+
exports.deduceTypeAll = deduceTypeAll;
|
|
213
264
|
//# sourceMappingURL=tools.js.map
|
package/out/natural/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/natural/tools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/natural/tools.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -50,7 +50,10 @@ export function handleMaterial({ json, tsDeclaration }: { json: Array<{ name: st
|
|
|
50
50
|
snippets.forEach((code) => {
|
|
51
51
|
const cap = code.match(/class ([a-zA-Z]+).+?extends ViewComponent/);
|
|
52
52
|
if (cap) {
|
|
53
|
-
|
|
53
|
+
const newCode = code
|
|
54
|
+
.replace(/nasl\.core\./g, "")
|
|
55
|
+
.replace(/Integer/g, "Long");
|
|
56
|
+
snippetMap[cap[1]] = `declare namespace nasl.ui${newCode}`;
|
|
54
57
|
}
|
|
55
58
|
});
|
|
56
59
|
json.forEach((item) => {
|
package/src/natural/tools.ts
CHANGED
|
@@ -153,9 +153,11 @@ export const deduceType = async (app: App, activeDesignerNode: any) => {
|
|
|
153
153
|
if (logic?.returns?.length && !logic.name.startsWith('LCAP')) {
|
|
154
154
|
const ret = logic.returns[0];
|
|
155
155
|
const typeAnnotation = ret?.typeAnnotation || ret?.__TypeAnnotation;
|
|
156
|
-
|
|
156
|
+
if (typeAnnotation)
|
|
157
|
+
typeMap[ret.nodePath] = typeAnnotation.toNaturalTS(state);
|
|
157
158
|
}
|
|
158
159
|
});
|
|
160
|
+
|
|
159
161
|
const params = activeDesignerNode?.params.concat(activeDesignerNode?.virtualParams || []);
|
|
160
162
|
if (params?.length) {
|
|
161
163
|
let code = '';
|
|
@@ -184,4 +186,52 @@ export const deduceType = async (app: App, activeDesignerNode: any) => {
|
|
|
184
186
|
}));
|
|
185
187
|
}
|
|
186
188
|
return { typeMap };
|
|
189
|
+
};
|
|
190
|
+
|
|
191
|
+
/**
|
|
192
|
+
* 组合所有的可推导类型
|
|
193
|
+
* @param app: 当前应用
|
|
194
|
+
* @returns 推导类型集合
|
|
195
|
+
*/
|
|
196
|
+
export const deduceTypeAll = async (app: App) => {
|
|
197
|
+
const typeMap = {} as any;
|
|
198
|
+
const { logics } = app;
|
|
199
|
+
const state = createCompilerState('', { descriptionComment: true, needNamespace: true });
|
|
200
|
+
|
|
201
|
+
logics.forEach((logic: any) => {
|
|
202
|
+
if (logic?.returns?.length && !logic.name.startsWith('LCAP')) {
|
|
203
|
+
const ret = logic.returns[0];
|
|
204
|
+
const typeAnnotation = ret?.typeAnnotation || ret?.__TypeAnnotation;
|
|
205
|
+
if (typeAnnotation)
|
|
206
|
+
typeMap[ret.nodePath] = typeAnnotation.toNaturalTS(state);
|
|
207
|
+
}
|
|
208
|
+
});
|
|
209
|
+
const dataSchemaMap = {} as any;
|
|
210
|
+
utils.traverse(({ node }: { node: any; }) => {
|
|
211
|
+
if (node?.concept === 'ViewElement') {
|
|
212
|
+
const dataSchema = node.bindAttrs.find((_: any) => _.name === 'dataSchema');
|
|
213
|
+
if (dataSchema) dataSchemaMap[dataSchema.nodePath] = node;
|
|
214
|
+
}
|
|
215
|
+
if (node?.concept === 'Logic' && node?.parentNode?.concept === 'BindEvent') {
|
|
216
|
+
const params = node?.params.concat(node?.virtualParams || []);
|
|
217
|
+
if (params?.length) {
|
|
218
|
+
let code = '';
|
|
219
|
+
params?.forEach((param: any, index: number) => {
|
|
220
|
+
if (param.name === 'event') code += 'event';
|
|
221
|
+
else code += param.toNaturalTS(state);
|
|
222
|
+
if (index !== params.length - 1) code += ', ';
|
|
223
|
+
});
|
|
224
|
+
typeMap[node.nodePath] = code;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}, { node: app }, { mode: 'onlyArray' });
|
|
228
|
+
await Promise.all(Object.entries(dataSchemaMap).map(async ([nodePath, node]) => {
|
|
229
|
+
const res = await app.naslServer.getDataSchemaStructureOrTypeAnnotation(node as any);
|
|
230
|
+
if (res) {
|
|
231
|
+
const dataSchemaTs = res.toNaturalTS(state);
|
|
232
|
+
typeMap[nodePath] = dataSchemaTs;
|
|
233
|
+
}
|
|
234
|
+
}));
|
|
235
|
+
|
|
236
|
+
return { typeMapAll: typeMap };
|
|
187
237
|
};
|