@lcap/nasl 4.0.1-rc.1 → 4.0.1-rc.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/genBundleFiles.d.ts.map +1 -1
- package/out/generator/genBundleFiles.js +2 -9
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/release-body/body.d.ts.map +1 -1
- package/out/generator/release-body/body.js +11 -1
- package/out/generator/release-body/body.js.map +1 -1
- package/out/generator/release-body/memory-optimization.d.ts +47 -0
- package/out/generator/release-body/memory-optimization.d.ts.map +1 -0
- package/out/generator/release-body/memory-optimization.js +266 -0
- package/out/generator/release-body/memory-optimization.js.map +1 -0
- package/out/natural/transforms/transform2LogicItem.d.ts.map +1 -1
- package/out/natural/transforms/transform2LogicItem.js +26 -11
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/server/extendBaseNode.js +1 -1
- package/out/server/extendBaseNode.js.map +1 -1
- package/out/server/findReference.d.ts.map +1 -1
- package/out/server/findReference.js +5 -1
- package/out/server/findReference.js.map +1 -1
- package/out/server/index.d.ts +0 -1
- package/out/server/index.d.ts.map +1 -1
- package/out/server/index.js +1 -2
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +4 -11
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +22 -38
- package/out/server/naslServer.js.map +1 -1
- package/package.json +10 -10
- package/sandbox/stdlib/nasl.util.ts +18 -4
|
@@ -0,0 +1,266 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Memory optimization utilities for deployment data
|
|
4
|
+
*/
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.smartDelay = exports.chunkLargeObject = exports.processInChunks = exports.compactAnnotatedJson = exports.resetOptimizationStats = exports.getOptimizationStats = exports.optimizeJsonDuringAnnotation = void 0;
|
|
7
|
+
// 统计信息用于监控优化效果
|
|
8
|
+
let optimizationStats = {
|
|
9
|
+
totalCalls: 0,
|
|
10
|
+
propertiesRemoved: 0,
|
|
11
|
+
emptyArraysRemoved: 0,
|
|
12
|
+
undefinedValuesRemoved: 0
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* 在标注过程中优化JSON对象，减少内存使用
|
|
16
|
+
* 这个函数专门用于集成到_toJSON过程中
|
|
17
|
+
*/
|
|
18
|
+
function optimizeJsonDuringAnnotation(jsonObject) {
|
|
19
|
+
if (!jsonObject || typeof jsonObject !== 'object') {
|
|
20
|
+
return jsonObject;
|
|
21
|
+
}
|
|
22
|
+
optimizationStats.totalCalls++;
|
|
23
|
+
// 要删除的属性列表
|
|
24
|
+
const propsToRemove = [
|
|
25
|
+
'folded', 'offsetX', 'offsetY', 'staticStyle', 'display',
|
|
26
|
+
'composedBy', 'silence', '_aiUID',
|
|
27
|
+
// Vue reactive internals
|
|
28
|
+
'__v_isRef', '__v_isReactive', '__v_isReadonly', '__v_isShallow',
|
|
29
|
+
'__v_skip', '__v_raw', '_rawValue', '_shallow'
|
|
30
|
+
];
|
|
31
|
+
// 删除不需要的属性
|
|
32
|
+
propsToRemove.forEach(prop => {
|
|
33
|
+
if (prop in jsonObject) {
|
|
34
|
+
delete jsonObject[prop];
|
|
35
|
+
optimizationStats.propertiesRemoved++;
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
// 删除undefined
|
|
39
|
+
Object.keys(jsonObject).forEach(key => {
|
|
40
|
+
const value = jsonObject[key];
|
|
41
|
+
if (value === undefined) {
|
|
42
|
+
delete jsonObject[key];
|
|
43
|
+
optimizationStats.undefinedValuesRemoved++;
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
return jsonObject;
|
|
47
|
+
}
|
|
48
|
+
exports.optimizeJsonDuringAnnotation = optimizeJsonDuringAnnotation;
|
|
49
|
+
/**
|
|
50
|
+
* 获取优化统计信息
|
|
51
|
+
*/
|
|
52
|
+
function getOptimizationStats() {
|
|
53
|
+
return { ...optimizationStats };
|
|
54
|
+
}
|
|
55
|
+
exports.getOptimizationStats = getOptimizationStats;
|
|
56
|
+
/**
|
|
57
|
+
* 重置优化统计信息
|
|
58
|
+
*/
|
|
59
|
+
function resetOptimizationStats() {
|
|
60
|
+
optimizationStats = {
|
|
61
|
+
totalCalls: 0,
|
|
62
|
+
propertiesRemoved: 0,
|
|
63
|
+
emptyArraysRemoved: 0,
|
|
64
|
+
undefinedValuesRemoved: 0
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
exports.resetOptimizationStats = resetOptimizationStats;
|
|
68
|
+
/**
|
|
69
|
+
* Removes additional unnecessary properties from annotated JSON to reduce size
|
|
70
|
+
*
|
|
71
|
+
* 注意：此函数用于独立的JSON压缩场景。
|
|
72
|
+
* 在主要的标注流程中，优化已经集成到了 optimizeJsonDuringAnnotation 中，
|
|
73
|
+
* 以减少内存使用和处理时间。
|
|
74
|
+
*
|
|
75
|
+
* 使用场景：
|
|
76
|
+
* - 需要对已有的JSON对象进行后处理压缩
|
|
77
|
+
* - 第三方系统集成中需要压缩JSON数据
|
|
78
|
+
* - 测试和验证优化效果
|
|
79
|
+
*/
|
|
80
|
+
function compactAnnotatedJson(annotatedJson) {
|
|
81
|
+
if (!annotatedJson || typeof annotatedJson !== 'object') {
|
|
82
|
+
return annotatedJson;
|
|
83
|
+
}
|
|
84
|
+
// Properties to remove for memory optimization
|
|
85
|
+
const propsToRemove = new Set([
|
|
86
|
+
'folded',
|
|
87
|
+
'offsetX',
|
|
88
|
+
'offsetY',
|
|
89
|
+
'staticStyle',
|
|
90
|
+
'display',
|
|
91
|
+
'composedBy',
|
|
92
|
+
'silence',
|
|
93
|
+
'_aiUID',
|
|
94
|
+
// Vue reactive internals
|
|
95
|
+
'__v_isRef',
|
|
96
|
+
'__v_isReactive',
|
|
97
|
+
'__v_isReadonly',
|
|
98
|
+
'__v_isShallow',
|
|
99
|
+
'__v_skip',
|
|
100
|
+
'__v_raw',
|
|
101
|
+
'_rawValue',
|
|
102
|
+
'_shallow',
|
|
103
|
+
// Common circular reference properties
|
|
104
|
+
'parentNode',
|
|
105
|
+
'parentKey',
|
|
106
|
+
'app',
|
|
107
|
+
'naslServer',
|
|
108
|
+
]);
|
|
109
|
+
// Track visited objects to prevent infinite recursion
|
|
110
|
+
const visited = new WeakMap();
|
|
111
|
+
let visitId = 0;
|
|
112
|
+
const compact = (obj, depth = 0) => {
|
|
113
|
+
// Prevent deep recursion
|
|
114
|
+
if (depth > 50) {
|
|
115
|
+
return '[Max Depth Reached]';
|
|
116
|
+
}
|
|
117
|
+
// Handle primitives and null
|
|
118
|
+
if (obj === null || typeof obj !== 'object') {
|
|
119
|
+
return obj;
|
|
120
|
+
}
|
|
121
|
+
// Handle circular references
|
|
122
|
+
if (visited.has(obj)) {
|
|
123
|
+
return `[Circular Reference: ${visited.get(obj)}]`;
|
|
124
|
+
}
|
|
125
|
+
const currentId = ++visitId;
|
|
126
|
+
visited.set(obj, currentId);
|
|
127
|
+
try {
|
|
128
|
+
if (Array.isArray(obj)) {
|
|
129
|
+
const result = [];
|
|
130
|
+
for (let i = 0; i < obj.length; i++) {
|
|
131
|
+
try {
|
|
132
|
+
const item = obj[i];
|
|
133
|
+
if (item !== undefined) {
|
|
134
|
+
result.push(compact(item, depth + 1));
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
// Skip problematic array items
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
return result;
|
|
143
|
+
}
|
|
144
|
+
// For objects, use a safer approach
|
|
145
|
+
const result = {};
|
|
146
|
+
// Get own property names and descriptors to handle getters safely
|
|
147
|
+
const propertyNames = Object.getOwnPropertyNames(obj);
|
|
148
|
+
for (const key of propertyNames) {
|
|
149
|
+
// Skip unwanted properties
|
|
150
|
+
if (propsToRemove.has(key)) {
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
// Skip internal/private properties
|
|
154
|
+
if (key.startsWith('__') || key.startsWith('_') || key === 'constructor') {
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
157
|
+
try {
|
|
158
|
+
// Check if property is a getter/setter that might cause issues
|
|
159
|
+
const descriptor = Object.getOwnPropertyDescriptor(obj, key);
|
|
160
|
+
if (descriptor?.get && !descriptor.set) {
|
|
161
|
+
// Skip getter-only properties as they might trigger Vue reactivity
|
|
162
|
+
continue;
|
|
163
|
+
}
|
|
164
|
+
const value = obj[key];
|
|
165
|
+
// Skip functions, symbols, and undefined
|
|
166
|
+
if (typeof value === 'function' || typeof value === 'symbol' || value === undefined) {
|
|
167
|
+
continue;
|
|
168
|
+
}
|
|
169
|
+
// Skip empty arrays to reduce size
|
|
170
|
+
if (Array.isArray(value) && value.length === 0) {
|
|
171
|
+
continue;
|
|
172
|
+
}
|
|
173
|
+
// Recursively compact the value
|
|
174
|
+
result[key] = compact(value, depth + 1);
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
// Skip properties that throw errors when accessed
|
|
178
|
+
continue;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
return result;
|
|
182
|
+
}
|
|
183
|
+
catch (error) {
|
|
184
|
+
// If all else fails, try JSON.parse(JSON.stringify()) for safe serialization
|
|
185
|
+
try {
|
|
186
|
+
return JSON.parse(JSON.stringify(obj));
|
|
187
|
+
}
|
|
188
|
+
catch (jsonError) {
|
|
189
|
+
return '[Serialization Error]';
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
finally {
|
|
193
|
+
// Clean up visited tracking for this object
|
|
194
|
+
visited.delete(obj);
|
|
195
|
+
}
|
|
196
|
+
};
|
|
197
|
+
try {
|
|
198
|
+
console.time('JSON Compaction');
|
|
199
|
+
const result = compact(annotatedJson);
|
|
200
|
+
console.timeEnd('JSON Compaction');
|
|
201
|
+
return result;
|
|
202
|
+
}
|
|
203
|
+
catch (error) {
|
|
204
|
+
console.warn('JSON compaction failed, using JSON.stringify fallback:', error);
|
|
205
|
+
// Safe fallback using native JSON serialization
|
|
206
|
+
try {
|
|
207
|
+
return JSON.parse(JSON.stringify(annotatedJson));
|
|
208
|
+
}
|
|
209
|
+
catch (fallbackError) {
|
|
210
|
+
console.error('Even JSON.stringify fallback failed:', fallbackError);
|
|
211
|
+
return annotatedJson;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
exports.compactAnnotatedJson = compactAnnotatedJson;
|
|
216
|
+
/**
|
|
217
|
+
* Processes large objects in chunks to avoid memory spikes
|
|
218
|
+
*/
|
|
219
|
+
async function processInChunks(items, processor, chunkSize = 100) {
|
|
220
|
+
const results = [];
|
|
221
|
+
for (let i = 0; i < items.length; i += chunkSize) {
|
|
222
|
+
const chunk = items.slice(i, i + chunkSize);
|
|
223
|
+
const chunkResults = await processor(chunk);
|
|
224
|
+
results.push(...chunkResults);
|
|
225
|
+
// Allow garbage collection between chunks
|
|
226
|
+
if (i % (chunkSize * 5) === 0) {
|
|
227
|
+
await new Promise(resolve => setTimeout(resolve, 1));
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return results;
|
|
231
|
+
}
|
|
232
|
+
exports.processInChunks = processInChunks;
|
|
233
|
+
/**
|
|
234
|
+
* Splits large objects into smaller chunks for processing
|
|
235
|
+
*/
|
|
236
|
+
function chunkLargeObject(obj, maxSize = 50) {
|
|
237
|
+
const entries = Object.entries(obj);
|
|
238
|
+
const chunks = [];
|
|
239
|
+
for (let i = 0; i < entries.length; i += maxSize) {
|
|
240
|
+
const chunkEntries = entries.slice(i, i + maxSize);
|
|
241
|
+
const chunk = Object.fromEntries(chunkEntries);
|
|
242
|
+
chunks.push(chunk);
|
|
243
|
+
}
|
|
244
|
+
return chunks;
|
|
245
|
+
}
|
|
246
|
+
exports.chunkLargeObject = chunkLargeObject;
|
|
247
|
+
/**
|
|
248
|
+
* Memory-aware delay function that considers current memory usage
|
|
249
|
+
*/
|
|
250
|
+
async function smartDelay(baseDelay = 10) {
|
|
251
|
+
// Check memory usage if available
|
|
252
|
+
const memory = performance?.memory;
|
|
253
|
+
if (memory) {
|
|
254
|
+
const usageRatio = memory.usedJSHeapSize / memory.jsHeapSizeLimit;
|
|
255
|
+
// If memory usage is high, delay longer to allow GC
|
|
256
|
+
const adjustedDelay = usageRatio > 0.8 ? baseDelay * 3 :
|
|
257
|
+
usageRatio > 0.6 ? baseDelay * 2 :
|
|
258
|
+
baseDelay;
|
|
259
|
+
await new Promise(resolve => setTimeout(resolve, adjustedDelay));
|
|
260
|
+
}
|
|
261
|
+
else {
|
|
262
|
+
await new Promise(resolve => setTimeout(resolve, baseDelay));
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
exports.smartDelay = smartDelay;
|
|
266
|
+
//# sourceMappingURL=memory-optimization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memory-optimization.js","sourceRoot":"","sources":["../../../src/generator/release-body/memory-optimization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA2I,MAAM,SAAS,CAAC;AAKzL,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,cAAc,GAAG,YAAY,GAAG,aAAa,CAAC;IACzD,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC;IACvB,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC;IAC1C,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAGnD,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACtE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC;IAC1C,qBAAqB,CAAC,EAAE,OAAO,mBAAmB,CAAC;IACnD,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,GAAG,oBAAoB,CAAC;AAE5E,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,SAAS,CAAC,aAAa,IAAI;IACxF,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;IAClC,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,gBAAgB,KAAK,CAAC;CAC1C,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;IACtG,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,KAAK,SAAS,CAAC,aAAa;CACvI,CAAC;AAEF,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAsE;IACxF,OAAO,CAAC,wBAAwB,CAA0C;IAE1E,QAAQ,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAGtI,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC,CAAC;IAItG,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB;CAsCvD;AAyED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,gBAAgB,EAAE,eAAe,GAAE,OAAe,
|
|
1
|
+
{"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,11 +130,15 @@ function assertAssignmentRightIsNotAnonymousFunction(expression) {
|
|
|
130
130
|
function fixExpression(arg, options, supportSubLogic = false) {
|
|
131
131
|
let expression;
|
|
132
132
|
if (options.transformType === 'logic' && supportSubLogic &&
|
|
133
|
-
(arg?.type === 'FunctionExpression' ||
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
133
|
+
(arg?.type === 'FunctionExpression' || (arg?.type === 'ArrowFunctionExpression'))) {
|
|
134
|
+
if (arg?.body?.type === 'BlockStatement') {
|
|
135
|
+
expression = transformTSCode2SubLogic(arg, options);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
const babelReturnStatement = utils_1.babelTypes.returnStatement(arg.body);
|
|
139
|
+
arg.body = utils_1.babelTypes.blockStatement([babelReturnStatement]);
|
|
140
|
+
expression = transformTSCode2SubLogic(arg, options);
|
|
141
|
+
}
|
|
138
142
|
}
|
|
139
143
|
else {
|
|
140
144
|
if (arg?.body?.type === 'ReturnStatement') {
|
|
@@ -1190,6 +1194,10 @@ function transformCall2CallDataSourceLogic(node, calleeName, callee, options) {
|
|
|
1190
1194
|
expression: fixExpression(arg, options),
|
|
1191
1195
|
}));
|
|
1192
1196
|
const newCalleeName = node?.callee?.property?.name;
|
|
1197
|
+
if (['update', 'batchUpdate']?.includes(newCalleeName)) {
|
|
1198
|
+
if (newArguments?.[0])
|
|
1199
|
+
newArguments[0].keyword = 'body';
|
|
1200
|
+
}
|
|
1193
1201
|
if (['updateBy', 'deleteBy']?.includes(newCalleeName)) {
|
|
1194
1202
|
const expression = newArguments?.[0]?.expression?.toJSON();
|
|
1195
1203
|
const argument2 = newArguments?.[1];
|
|
@@ -1213,6 +1221,7 @@ function transformCall2CallDataSourceLogic(node, calleeName, callee, options) {
|
|
|
1213
1221
|
})];
|
|
1214
1222
|
if (newCalleeName === 'updateBy') {
|
|
1215
1223
|
if (argument2?.expression?.concept !== 'AnonymousFunction') {
|
|
1224
|
+
argument2.keyword = 'body';
|
|
1216
1225
|
newArguments.push(argument2);
|
|
1217
1226
|
}
|
|
1218
1227
|
else {
|
|
@@ -1299,10 +1308,16 @@ exports.transformCall2JSONFunctions = transformCall2JSONFunctions;
|
|
|
1299
1308
|
function transform2CallFunction(node, calleeName, argument, options) {
|
|
1300
1309
|
calleeName = utils_1.replaceCallFunctionMap?.[calleeName] || calleeName;
|
|
1301
1310
|
const func = server_1.default ? server_1.default.getBuildInFunction(calleeName) : null;
|
|
1302
|
-
let newArguments = argument.map((arg, index) =>
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
|
|
1311
|
+
let newArguments = argument.map((arg, index) => {
|
|
1312
|
+
let supportSubLogic = false;
|
|
1313
|
+
if (arg?.type === 'FunctionExpression' || (arg?.type === 'ArrowFunctionExpression' && arg?.body?.type === 'BlockStatement')) {
|
|
1314
|
+
supportSubLogic = true;
|
|
1315
|
+
}
|
|
1316
|
+
return new utils_1.naslTypes.Argument({
|
|
1317
|
+
expression: fixExpression(arg, options, supportSubLogic),
|
|
1318
|
+
keyword: func && func?.params[index]?.name || `param${index + 1}`,
|
|
1319
|
+
});
|
|
1320
|
+
});
|
|
1306
1321
|
let newTypeArguments = node?.typeParameters?.params.map(transform2TypeAnnotation_1.transform2TypeAnnotation);
|
|
1307
1322
|
if (calleeName === 'ListRepeat') {
|
|
1308
1323
|
newTypeArguments = [
|
|
@@ -1676,7 +1691,7 @@ function transformCall2Extension(node, calleeName, callee, options) {
|
|
|
1676
1691
|
calleeNamespace: (0, utils_1.generate)(node?.callee?.object)?.code,
|
|
1677
1692
|
calleeName: callee?.[callee?.length - 1]?.name,
|
|
1678
1693
|
arguments: node?.arguments?.map((arg) => new utils_1.naslTypes.Argument({
|
|
1679
|
-
expression: fixExpression(arg, options),
|
|
1694
|
+
expression: fixExpression(arg, options, true),
|
|
1680
1695
|
})),
|
|
1681
1696
|
});
|
|
1682
1697
|
}
|
|
@@ -1773,7 +1788,7 @@ function transformCall2Logic(node, calleeName, callee, options) {
|
|
|
1773
1788
|
calleeNamespace,
|
|
1774
1789
|
calleeName: newCalleeName,
|
|
1775
1790
|
arguments: node?.arguments?.map((arg) => new utils_1.naslTypes.Argument({
|
|
1776
|
-
expression: fixExpression(arg, options),
|
|
1791
|
+
expression: fixExpression(arg, options, true),
|
|
1777
1792
|
})),
|
|
1778
1793
|
});
|
|
1779
1794
|
}
|