@lcap/nasl 3.9.1-beta.15 → 3.9.1-beta.17
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.map +1 -1
- package/out/generator/annotation/incremental.js +8 -6
- package/out/generator/annotation/incremental.js.map +1 -1
- package/out/generator/release-body/body.d.ts.map +1 -1
- package/out/generator/release-body/body.js +51 -49
- package/out/generator/release-body/body.js.map +1 -1
- package/out/natural/genNaturalTS.d.ts +2 -1
- package/out/natural/genNaturalTS.d.ts.map +1 -1
- package/out/natural/genNaturalTS.js +16 -11
- package/out/natural/genNaturalTS.js.map +1 -1
- package/out/natural/getContext/index.d.ts +2 -2
- package/out/natural/getContext/index.d.ts.map +1 -1
- package/out/natural/getContext/index.js +5 -3
- package/out/natural/getContext/index.js.map +1 -1
- package/out/natural/getContext/naslStdlibMap.d.ts.map +1 -1
- package/out/natural/getContext/naslStdlibMap.js +0 -2
- package/out/natural/getContext/naslStdlibMap.js.map +1 -1
- package/out/server/naslServer.js +1 -1
- package/out/server/naslServer.js.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.d.ts +1 -1
- package/out/templator/genCurdMultipleKeyBlock.d.ts.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.js +102 -100
- package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
- package/package.json +13 -13
- package/sandbox-natural/stdlib/nasl.core.d.ts +12 -48
- package/sandbox-natural/stdlib/nasl.ui.d.ts +26 -6
- package/sandbox-natural/stdlib/nasl.util.d.ts +63 -84
- package/sandbox-natural/stdlib/nasl.coreApp.d.ts +0 -99
|
@@ -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;AAE1C,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAItD,WAAW;AACX,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,eAAe,EACjC,MAAM,oCAAiB,GACtB,OAAO,CAAC,2BAA2B,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;AAE1C,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAItD,WAAW;AACX,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,eAAe,EACjC,MAAM,oCAAiB,GACtB,OAAO,CAAC,2BAA2B,CAAC,CA6LtC"}
|
|
@@ -5,13 +5,12 @@ 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
|
-
const body_1 = require("../release-body/body");
|
|
9
8
|
const patch_1 = require("./patch");
|
|
10
9
|
const utils_1 = require("./utils");
|
|
11
10
|
/** 增量标注 */
|
|
12
11
|
async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGraphCache, logger = nasl_utils_1.internalLogger) {
|
|
13
12
|
await logger.info(utils_1.LogEventName, '开始进行增量标注');
|
|
14
|
-
const naslCache =
|
|
13
|
+
const naslCache = nasl_concepts_1.App.createSilenceApp(naslCacheData);
|
|
15
14
|
await logger.info(utils_1.LogEventName, 'Nasl 缓存实例化结束');
|
|
16
15
|
// 这里因为没有调用 OpenApp 所以必须要手动添加
|
|
17
16
|
app.naslServer = server;
|
|
@@ -48,6 +47,8 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
|
|
|
48
47
|
const replaceNode = (old, cacheNode) => {
|
|
49
48
|
const { parentNode, parentKey, nodePath } = old;
|
|
50
49
|
const oldInParent = old.parentNode[old.parentKey];
|
|
50
|
+
cacheNode.parentNode = parentNode;
|
|
51
|
+
cacheNode.parentKey = parentKey;
|
|
51
52
|
// 直接就是自己,则直接替换
|
|
52
53
|
if (oldInParent === old) {
|
|
53
54
|
parentNode[parentKey] = cacheNode;
|
|
@@ -80,7 +81,7 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
|
|
|
80
81
|
}
|
|
81
82
|
(0, patch_1.patch)(current, cacheNode, app, naslCache);
|
|
82
83
|
const typeAnnotationData = cacheNode.typeAnnotation ?? cacheNode.__TypeAnnotation;
|
|
83
|
-
if (
|
|
84
|
+
if (typeAnnotationData) {
|
|
84
85
|
current.typeAnnotation = typeAnnotationData;
|
|
85
86
|
typeAnnotationData.parentNode = current;
|
|
86
87
|
}
|
|
@@ -151,9 +152,10 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
|
|
|
151
152
|
await logger.info(utils_1.LogEventName, '生成标注数据开始');
|
|
152
153
|
const annotationJson = app.toAnnotationJSON();
|
|
153
154
|
await logger.info(utils_1.LogEventName, '生成标注数据结束');
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
155
|
+
// TODO: 导出源码才需要
|
|
156
|
+
// await logger.info(LogEventName, '替换静态资源开始');
|
|
157
|
+
// replaceAssets(app, annotationJson);
|
|
158
|
+
// await logger.info(LogEventName, '替换静态资源结束');
|
|
157
159
|
return {
|
|
158
160
|
isFull: modules.length === allModules.length,
|
|
159
161
|
updatedModules: modules.map((item) => item.name),
|
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../../src/generator/release-body/body.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAEH,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAgBjD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,QAAQ,QAyBrF;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../../src/generator/release-body/body.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAEH,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAgBjD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,QAAQ,QAyBrF;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,QAAQ,QA2BhF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,mBAAmB,QA8E3E;AAED,eAAe;AACf,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,mBAAmB,gBAuB7E;AA0FD,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CtE"}
|
|
@@ -88,8 +88,8 @@ function replaceFrontendAssets(frontendTypes, fn) {
|
|
|
88
88
|
}
|
|
89
89
|
exports.replaceFrontendAssets = replaceFrontendAssets;
|
|
90
90
|
function replaceAssets(app, json, opt) {
|
|
91
|
-
//
|
|
92
|
-
if (opt?.realRelease) {
|
|
91
|
+
// 非增量发布的发布状态排除 views,导出源码不排除
|
|
92
|
+
if (!opt?.isIncremental && opt?.realRelease) {
|
|
93
93
|
json.frontendTypes.forEach((frontendType) => {
|
|
94
94
|
frontendType.frontends.forEach((frontend) => {
|
|
95
95
|
delete frontend.views;
|
|
@@ -97,16 +97,36 @@ function replaceAssets(app, json, opt) {
|
|
|
97
97
|
});
|
|
98
98
|
}
|
|
99
99
|
const assets = opt?.assets ?? [];
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
100
|
+
if (opt?.isExport) {
|
|
101
|
+
// 导出前端源码+后端源码
|
|
102
|
+
if (opt?.ignoreFiles && Array.isArray(assets) && assets.length) {
|
|
103
|
+
const assetsMap = opt.assetsMap;
|
|
104
|
+
// 正则
|
|
105
|
+
const regex = utils.transAssetsToRegx(assets, 'fileUrl');
|
|
106
|
+
replaceFrontendTypesAssets(json.frontendTypes, (node, key, url) => {
|
|
107
|
+
if (['staticStyle'].includes(key)) {
|
|
108
|
+
node[key] = url.replace(regex, (url) => {
|
|
109
|
+
const asset = utils.getAssetFromAssetsMap(assetsMap, url);
|
|
110
|
+
if (asset) {
|
|
111
|
+
const assetName = asset.name;
|
|
112
|
+
const path = `/assets/${assetName}`;
|
|
113
|
+
config_1.config.assets.push({
|
|
114
|
+
path,
|
|
115
|
+
isDir: false,
|
|
116
|
+
url,
|
|
117
|
+
});
|
|
118
|
+
const encodeAssetName = encodeURIComponent(assetName);
|
|
119
|
+
const encodePath = `/assets/${encodeAssetName}`;
|
|
120
|
+
return encodePath;
|
|
121
|
+
}
|
|
122
|
+
return url;
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
108
126
|
const asset = utils.getAssetFromAssetsMap(assetsMap, url);
|
|
109
127
|
if (asset) {
|
|
128
|
+
// 这里是用户上传的图片链接 在导出的时候变为 离线下载的
|
|
129
|
+
// 上边也是同样的目的 只是处理的css样式里的图片链接
|
|
110
130
|
const assetName = asset.name;
|
|
111
131
|
const path = `/assets/${assetName}`;
|
|
112
132
|
config_1.config.assets.push({
|
|
@@ -116,52 +136,34 @@ function replaceAssets(app, json, opt) {
|
|
|
116
136
|
});
|
|
117
137
|
const encodeAssetName = encodeURIComponent(assetName);
|
|
118
138
|
const encodePath = `/assets/${encodeAssetName}`;
|
|
119
|
-
|
|
139
|
+
node[key] = encodePath;
|
|
120
140
|
}
|
|
121
|
-
|
|
122
|
-
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
replaceFrontendAssets(json.frontendTypes, (node, key, url, frontend) => {
|
|
145
|
+
// 增加处理两种情况 1 css 自带图片; 2 src 属性带的图片 3 用户上传的icon name 属性
|
|
146
|
+
if (['staticStyle'].includes(key)) {
|
|
147
|
+
// "background: url('/assets/login-bg-1.jpg') no-repeat; background-size: cover; height: 100vh;"
|
|
148
|
+
if (url.includes(`url('/assets/`) && app.sysPrefixPath?.length > 0) {
|
|
149
|
+
node[key] = url.replace(/url\('\/assets\/(.*?)'\)/, `url('${app.sysPrefixPath}/assets/$1')`);
|
|
150
|
+
}
|
|
151
|
+
if (url.includes(`url(/assets/`) && app.sysPrefixPath?.length > 0) {
|
|
152
|
+
node[key] = url.replace(/url\(\/assets\/(.*?)\)/, `url(${app.sysPrefixPath}/assets/$1)`);
|
|
153
|
+
}
|
|
123
154
|
}
|
|
124
155
|
else {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
path,
|
|
133
|
-
isDir: false,
|
|
134
|
-
url,
|
|
135
|
-
});
|
|
136
|
-
const encodeAssetName = encodeURIComponent(assetName);
|
|
137
|
-
const encodePath = `/assets/${encodeAssetName}`;
|
|
138
|
-
node[key] = encodePath;
|
|
156
|
+
if (['src', 'name'].includes(node.name) && /^\/assets\/(.*?)$/.test(url) && app.sysPrefixPath?.length > 0) {
|
|
157
|
+
const basePath = frontend.path && frontend.path !== '/' ? frontend.path : '';
|
|
158
|
+
let sysPath = app.sysPrefixPath;
|
|
159
|
+
if (basePath !== '') {
|
|
160
|
+
sysPath = sysPath + basePath;
|
|
161
|
+
}
|
|
162
|
+
node[key] = `${sysPath}${url}`;
|
|
139
163
|
}
|
|
140
164
|
}
|
|
141
165
|
});
|
|
142
166
|
}
|
|
143
|
-
replaceFrontendAssets(json.frontendTypes, (node, key, url, frontend) => {
|
|
144
|
-
// 增加处理两种情况 1 css 自带图片; 2 src 属性带的图片 3 用户上传的icon name 属性
|
|
145
|
-
if (['staticStyle'].includes(key)) {
|
|
146
|
-
// "background: url('/assets/login-bg-1.jpg') no-repeat; background-size: cover; height: 100vh;"
|
|
147
|
-
if (url.includes(`url('/assets/`) && app.sysPrefixPath?.length > 0) {
|
|
148
|
-
node[key] = url.replace(/url\('\/assets\/(.*?)'\)/, `url('${app.sysPrefixPath}/assets/$1')`);
|
|
149
|
-
}
|
|
150
|
-
if (url.includes(`url(/assets/`) && app.sysPrefixPath?.length > 0) {
|
|
151
|
-
node[key] = url.replace(/url\(\/assets\/(.*?)\)/, `url(${app.sysPrefixPath}/assets/$1)`);
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
if (['src', 'name'].includes(node.name) && /^\/assets\/(.*?)$/.test(url) && app.sysPrefixPath?.length > 0) {
|
|
156
|
-
const basePath = frontend.path && frontend.path !== '/' ? frontend.path : '';
|
|
157
|
-
let sysPath = app.sysPrefixPath;
|
|
158
|
-
if (basePath !== '') {
|
|
159
|
-
sysPath = sysPath + basePath;
|
|
160
|
-
}
|
|
161
|
-
node[key] = `${sysPath}${url}`;
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
});
|
|
165
167
|
}
|
|
166
168
|
exports.replaceAssets = replaceAssets;
|
|
167
169
|
/** 获取全量标注数据 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/generator/release-body/body.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,sDAA2D;AAE3D,mCAOiB;AACjB,8CAAoE;AACpE,6CAAgD;AAEhD,mDAAqC;AACrC,yCAAsD;AAGtD;;;;GAIG;AACH,SAAgB,0BAA0B,CAAC,aAA6B,EAAE,EAAY;IACpF,aAAa,CAAC,OAAO,CAAC,CAAC,YAA0B,EAAE,EAAE;QACnD,KAAK,CAAC,QAAQ,CAAC,CAAC,OAEf,EAAE,EAAE;YACH,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC/B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7B,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE;YACzB,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,GAAG,CAAC;gBACzC,YAAY;gBACZ,WAAW;gBACX,aAAa;gBACb,eAAe;gBACf,mBAAmB;gBACnB,YAAY;gBACZ,SAAS;gBACT,iBAAiB;gBACjB,cAAc;aACf,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,gEAyBC;AAED,SAAgB,qBAAqB,CAAC,aAA6B,EAAE,EAAY;IAC/E,aAAa,CAAC,OAAO,CAAC,CAAC,YAA0B,EAAE,EAAE;QACnD,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,QAAkB,EAAE,EAAE;YACtD,KAAK,CAAC,QAAQ,CAAC,CAAC,OAEf,EAAE,EAAE;gBACH,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;oBAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC/B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC7B,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;oBACxC,CAAC;gBACH,CAAC;YACH,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;gBACrB,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,GAAG,CAAC;oBACzC,YAAY;oBACZ,WAAW;oBACX,aAAa;oBACb,eAAe;oBACf,mBAAmB;oBACnB,YAAY;oBACZ,SAAS;oBACT,iBAAiB;oBACjB,cAAc;iBACf,CAAC;aACH,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/generator/release-body/body.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ export declare function genNaturalTSContextJSONForLogic(app: App, currentNode?:
|
|
|
21
21
|
naslUtil: string;
|
|
22
22
|
naslUI: string;
|
|
23
23
|
components: any;
|
|
24
|
+
naslOql: string;
|
|
24
25
|
enums: {
|
|
25
26
|
namespace: string;
|
|
26
27
|
data: import("./getContext").Snippet[];
|
|
@@ -61,7 +62,7 @@ export declare function genNaturalTSContextJSONForLogic(app: App, currentNode?:
|
|
|
61
62
|
namespace: string;
|
|
62
63
|
data: import("./getContext").Snippet[];
|
|
63
64
|
};
|
|
64
|
-
|
|
65
|
+
currentLogic: string;
|
|
65
66
|
logicType: string;
|
|
66
67
|
componentDeclaration: string;
|
|
67
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genNaturalTS.d.ts","sourceRoot":"","sources":["../../src/natural/genNaturalTS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,QAAQ,EAAY,MAAM,aAAa,CAAC;AAoC7D,OAAO,KAAK,iBAAiB,MAAM,cAAc,CAAC;AAElD,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,EAAE,MAAM,UAatF;AAGD,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,QAAQ,EACtB,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,OAAO,EACtB,QAAQ,CAAC,EAAE;IACT,gBAAgB,EAAE,GAAG,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,cAAc,EAAE,IAAI,GAAG,IAAI,GAAG;QAAE,IAAI,EAAE,GAAG,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,GAAG,CAAC;KAAE,CAAC;IACtF,kBAAkB,EAAE,IAAI,GAAG,IAAI,GAAG;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;KACvB,EAAE,CAAC;CACL,EACD,UAAU,CAAC,EAAE,GAAG
|
|
1
|
+
{"version":3,"file":"genNaturalTS.d.ts","sourceRoot":"","sources":["../../src/natural/genNaturalTS.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.genNaturalTSContextForUI = exports.genNaturalTSContextFromJSONForUI = exports.genNaturalTSContextJSONForUI = exports.genNaturalTsContextJson = exports.genNaturalTSContext = exports.genNaturalTSContextForLogic = exports.genNaturalTSContextFromJSONForLogic = exports.genNaturalTSContextJSONForLogic = exports.genNaturalTS = exports.getNaturalContext = void 0;
|
|
27
27
|
const getContext_1 = require("./getContext");
|
|
28
28
|
const translator_1 = require("../translator");
|
|
29
|
-
const tools_1 = require("./tools");
|
|
30
29
|
exports.getNaturalContext = __importStar(require("./getContext"));
|
|
31
30
|
function genNaturalTS(app, currentNode, focusedNodePath) {
|
|
32
31
|
if (currentNode?.concept === 'Logic') {
|
|
@@ -44,14 +43,14 @@ exports.genNaturalTS = genNaturalTS;
|
|
|
44
43
|
// =========================== logic ===========================
|
|
45
44
|
function genNaturalTSContextJSONForLogic(app, currentNode, focusedNodePath, experimental, material, restParams) {
|
|
46
45
|
const frontend = currentNode?.getAncestor('Frontend');
|
|
47
|
-
const logicType =
|
|
46
|
+
const logicType = currentNode?.parentNode?.concept === 'App' ? 'global_logic' : 'view_logic';
|
|
48
47
|
const state = (0, translator_1.createCompilerState)('', { descriptionComment: true, typeMap: restParams?.typeMap });
|
|
49
48
|
const { naslCore } = (0, getContext_1.getNaslCore)(logicType);
|
|
50
49
|
const { naslUtil } = (0, getContext_1.getNaslUtil)();
|
|
51
50
|
const { naslUI } = (0, getContext_1.getNaslUIOld)();
|
|
52
51
|
let components = [];
|
|
53
52
|
let allNodesAPI = {};
|
|
54
|
-
if (logicType
|
|
53
|
+
if (logicType === 'view_logic' && material?.basicMaterials && material?.extensionMaterials) {
|
|
55
54
|
const { naslUI: componentsTemp, allNodesAPI: allNodeAPITemp } = (0, getContext_1.getNaslUI)(app, frontend.type, {
|
|
56
55
|
basicMaterials: material?.basicMaterials,
|
|
57
56
|
extensionMaterials: material?.extensionMaterials,
|
|
@@ -59,6 +58,7 @@ function genNaturalTSContextJSONForLogic(app, currentNode, focusedNodePath, expe
|
|
|
59
58
|
components = componentsTemp;
|
|
60
59
|
allNodesAPI = allNodeAPITemp;
|
|
61
60
|
}
|
|
61
|
+
const { naslOql } = (0, getContext_1.getNaslOQL)();
|
|
62
62
|
const { enums } = (0, getContext_1.getEnums)(app, state);
|
|
63
63
|
const { entities } = (0, getContext_1.getEntities)(app, state);
|
|
64
64
|
const { structures } = (0, getContext_1.getStructures)(app, state);
|
|
@@ -75,13 +75,14 @@ function genNaturalTSContextJSONForLogic(app, currentNode, focusedNodePath, expe
|
|
|
75
75
|
const { frontendVariables } = (0, getContext_1.getFrontendVariables)(currentNode?.getAncestor('Frontend'), state);
|
|
76
76
|
const { backendVariables } = (0, getContext_1.getServerVariables)(app, state);
|
|
77
77
|
const { views } = (0, getContext_1.getFrontendViews)(frontend, state, currentNode, false);
|
|
78
|
-
const {
|
|
78
|
+
const { currentLogic } = (0, getContext_1.getCurrentNodeContext)(currentNode, focusedNodePath, experimental, restParams?.typeMap);
|
|
79
79
|
const { componentDeclaration } = (0, getContext_1.getCurrentComponentDeclaration)(currentNode, allNodesAPI);
|
|
80
80
|
return {
|
|
81
81
|
naslCore,
|
|
82
82
|
naslUtil,
|
|
83
83
|
naslUI,
|
|
84
84
|
components,
|
|
85
|
+
naslOql,
|
|
85
86
|
enums,
|
|
86
87
|
entities,
|
|
87
88
|
structures,
|
|
@@ -92,7 +93,7 @@ function genNaturalTSContextJSONForLogic(app, currentNode, focusedNodePath, expe
|
|
|
92
93
|
frontendVariables,
|
|
93
94
|
backendVariables,
|
|
94
95
|
views,
|
|
95
|
-
|
|
96
|
+
currentLogic,
|
|
96
97
|
logicType,
|
|
97
98
|
componentDeclaration
|
|
98
99
|
};
|
|
@@ -107,13 +108,13 @@ exports.genNaturalTSContextJSONForLogic = genNaturalTSContextJSONForLogic;
|
|
|
107
108
|
* @param requiredIndexes?: 通过索引获取对应的 code。可挑选需要的 code
|
|
108
109
|
**/
|
|
109
110
|
const genNaturalTSContextFromJSONForLogic = (tsContextJSON, codeType, requiredIndexes) => {
|
|
110
|
-
const { naslCore, naslUtil, naslUI, enums, entities, structures, appLogics, interfaceDependencies, connections, dependencies, frontendVariables, backendVariables, views,
|
|
111
|
+
const { naslCore, naslUtil, naslUI, naslOql, enums, entities, structures, appLogics, interfaceDependencies, connections, dependencies, frontendVariables, backendVariables, views, currentLogic, logicType, componentDeclaration } = tsContextJSON;
|
|
111
112
|
let code = '';
|
|
112
113
|
code += '### [1]标准库与类型定义\n';
|
|
113
114
|
code += (0, getContext_1.wrapTSBlock)(naslCore);
|
|
114
115
|
code += '\n### [2]平台内置函数库\n';
|
|
115
116
|
code += (0, getContext_1.wrapTSBlock)(naslUtil);
|
|
116
|
-
if (naslUI && logicType
|
|
117
|
+
if (naslUI && logicType === 'view_logic') {
|
|
117
118
|
code += '\n### [3] nasl.ui\n';
|
|
118
119
|
if (typeof naslUI === 'string') {
|
|
119
120
|
code += (0, getContext_1.wrapTSBlock)(naslUI);
|
|
@@ -126,6 +127,10 @@ const genNaturalTSContextFromJSONForLogic = (tsContextJSON, codeType, requiredIn
|
|
|
126
127
|
code += (0, getContext_1.wrapTSBlock)(`declare namespace nasl.ui {\n${componentDeclaration}}`);
|
|
127
128
|
}
|
|
128
129
|
}
|
|
130
|
+
if (naslOql && logicType === 'global_logic') {
|
|
131
|
+
code += '\n### [4]数据查询定义\n';
|
|
132
|
+
code += (0, getContext_1.wrapTSBlock)(naslOql);
|
|
133
|
+
}
|
|
129
134
|
code += '\n### [5] 全局上下文\n';
|
|
130
135
|
if (enums.data?.length) {
|
|
131
136
|
code += '\n#### [5-0] 枚举\n';
|
|
@@ -155,7 +160,7 @@ const genNaturalTSContextFromJSONForLogic = (tsContextJSON, codeType, requiredIn
|
|
|
155
160
|
code += '\n### [9] 依赖库逻辑列表\n';
|
|
156
161
|
code += (0, getContext_1.getDependenciesCode)(dependencies, codeType, requiredIndexes);
|
|
157
162
|
}
|
|
158
|
-
if (logicType
|
|
163
|
+
if (logicType === 'view_logic') {
|
|
159
164
|
code += '\n### [10] 页面上下文\n';
|
|
160
165
|
if (frontendVariables?.data?.length) {
|
|
161
166
|
code += '\n#### [10-0] 前端全局变量\n';
|
|
@@ -173,7 +178,7 @@ const genNaturalTSContextFromJSONForLogic = (tsContextJSON, codeType, requiredIn
|
|
|
173
178
|
}
|
|
174
179
|
}
|
|
175
180
|
code += '\n### 当前逻辑上下文\n';
|
|
176
|
-
code += (0, getContext_1.wrapTSBlock)(
|
|
181
|
+
code += (0, getContext_1.wrapTSBlock)(currentLogic);
|
|
177
182
|
return code;
|
|
178
183
|
};
|
|
179
184
|
exports.genNaturalTSContextFromJSONForLogic = genNaturalTSContextFromJSONForLogic;
|
|
@@ -205,7 +210,7 @@ function genNaturalTSContextJSONForUI(app, currentNode, material, restParams) {
|
|
|
205
210
|
const { dependencies } = (0, getContext_1.getDependencies)(material?.dependencies || app?.dependencies, state, 'view_logic', frontend?.type);
|
|
206
211
|
const { frontendVariables } = (0, getContext_1.getFrontendVariables)(frontend, state);
|
|
207
212
|
const { views } = (0, getContext_1.getFrontendViews)(frontend, state, currentNode, false);
|
|
208
|
-
const {
|
|
213
|
+
const { currentLogic } = (0, getContext_1.getCurrentNodeContextForUI)(currentNode, restParams?.typeMap);
|
|
209
214
|
const { componentDeclaration } = (0, getContext_1.getCurrentComponentDeclaration)(currentNode, allNodesAPI);
|
|
210
215
|
return {
|
|
211
216
|
naslCore,
|
|
@@ -221,7 +226,7 @@ function genNaturalTSContextJSONForUI(app, currentNode, material, restParams) {
|
|
|
221
226
|
dependencies,
|
|
222
227
|
frontendVariables,
|
|
223
228
|
views,
|
|
224
|
-
currentPage:
|
|
229
|
+
currentPage: currentLogic,
|
|
225
230
|
};
|
|
226
231
|
}
|
|
227
232
|
exports.genNaturalTSContextJSONForUI = genNaturalTSContextJSONForUI;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genNaturalTS.js","sourceRoot":"","sources":["../../src/natural/genNaturalTS.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"genNaturalTS.js","sourceRoot":"","sources":["../../src/natural/genNaturalTS.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,11 +139,11 @@ export declare function getFrontendViews(frontend: Frontend, state: TranslatorSt
|
|
|
139
139
|
export declare const getFrontendViewsCode: (views: any) => string;
|
|
140
140
|
export declare function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: string, experimental?: boolean, typeMap?: any): {
|
|
141
141
|
code: string;
|
|
142
|
-
|
|
142
|
+
currentLogic: string;
|
|
143
143
|
};
|
|
144
144
|
export declare function getCurrentNodeContextForUI(currentNode: BaseNode, typeMap?: any): {
|
|
145
145
|
code: string;
|
|
146
|
-
|
|
146
|
+
currentLogic: string;
|
|
147
147
|
};
|
|
148
148
|
export declare function removeUnnecessary(componentDeclaration: string, requiredIndexesName: string[], codeType: string): string;
|
|
149
149
|
export declare function getCurrentComponentDeclaration(activeDesignerNode: any, allNodesAPI: any): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/natural/getContext/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAa,MAAM,EAAkB,SAAS,EAAE,UAAU,EAAE,SAAS,EAA4B,MAAM,gBAAgB,CAAC;AACrK,OAAO,EAAmC,eAAe,EAAU,MAAM,kBAAkB,CAAC;AAG5F,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB;AAED,eAAO,MAAM,WAAW,SAAU,MAAM,WAEvC,CAAC;AAGF,wBAAgB,sBAAsB,CAAC,mBAAmB,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;CAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,GAAG,CAuBxI;AAGD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;CAAE,EAAE,SAAS,EAAE,MAAM,UAoDxI;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/natural/getContext/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -119,7 +119,9 @@ exports.getLogicWithStructuresCode = getLogicWithStructuresCode;
|
|
|
119
119
|
function getNaslCore(logicType) {
|
|
120
120
|
let naslCore = `${(0, naslStdlibMap_1.getNASLStdlibMap)('nasl.core.d.ts')}\n`;
|
|
121
121
|
if (logicType === 'global_logic')
|
|
122
|
-
naslCore
|
|
122
|
+
naslCore += `// 分页组件函数,用于分页
|
|
123
|
+
declare function PAGINATE<T>(list: List<T>, page: Integer, size: Integer): { list: List<T>, total: Integer; };
|
|
124
|
+
`;
|
|
123
125
|
const code = (0, exports.wrapTSBlock)(naslCore);
|
|
124
126
|
return { code, naslCore };
|
|
125
127
|
}
|
|
@@ -714,7 +716,7 @@ function getCurrentNodeContext(currentNode, focusedNodePath, experimental, typeM
|
|
|
714
716
|
typeMap
|
|
715
717
|
}));
|
|
716
718
|
}
|
|
717
|
-
return { code: (0, exports.wrapTSBlock)(code),
|
|
719
|
+
return { code: (0, exports.wrapTSBlock)(code), currentLogic: code };
|
|
718
720
|
}
|
|
719
721
|
exports.getCurrentNodeContext = getCurrentNodeContext;
|
|
720
722
|
function getCurrentNodeContextForUI(currentNode, typeMap) {
|
|
@@ -738,7 +740,7 @@ function getCurrentNodeContextForUI(currentNode, typeMap) {
|
|
|
738
740
|
typeMap,
|
|
739
741
|
}));
|
|
740
742
|
}
|
|
741
|
-
return { code: (0, exports.wrapTSBlock)(code),
|
|
743
|
+
return { code: (0, exports.wrapTSBlock)(code), currentLogic: code };
|
|
742
744
|
}
|
|
743
745
|
exports.getCurrentNodeContextForUI = getCurrentNodeContextForUI;
|
|
744
746
|
const calcComponent = (activeDesignerNode) => {
|