@nestia/e2e 0.3.1-dev.20230526 → 0.3.1-dev.20230526-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/lib/DynamicExecutor.js +57 -50
- package/lib/DynamicExecutor.js.map +1 -1
- package/package.json +2 -2
- package/src/DynamicExecutor.ts +4 -5
package/lib/DynamicExecutor.js
CHANGED
|
@@ -102,8 +102,8 @@ exports.DynamicExecutor = void 0;
|
|
|
102
102
|
var chalk_1 = __importDefault(require("chalk"));
|
|
103
103
|
var fs_1 = __importDefault(require("fs"));
|
|
104
104
|
var path_1 = __importDefault(require("path"));
|
|
105
|
-
var tstl_1 = require("tstl");
|
|
106
105
|
var StopWatch_1 = require("./StopWatch");
|
|
106
|
+
var tstl_1 = require("tstl");
|
|
107
107
|
/**
|
|
108
108
|
* Dynamic Executor running prefixed functions.
|
|
109
109
|
*
|
|
@@ -199,11 +199,11 @@ var DynamicExecutor;
|
|
|
199
199
|
directory = _b.sent();
|
|
200
200
|
_b.label = 2;
|
|
201
201
|
case 2:
|
|
202
|
-
_b.trys.push([2, 13, 14
|
|
202
|
+
_b.trys.push([2, 12, 13, 14]);
|
|
203
203
|
directory_1 = __values(directory), directory_1_1 = directory_1.next();
|
|
204
204
|
_b.label = 3;
|
|
205
205
|
case 3:
|
|
206
|
-
if (!!directory_1_1.done) return [3 /*break*/,
|
|
206
|
+
if (!!directory_1_1.done) return [3 /*break*/, 11];
|
|
207
207
|
file = directory_1_1.value;
|
|
208
208
|
location_1 = path_1.default.resolve("".concat(path, "/").concat(file));
|
|
209
209
|
return [4 /*yield*/, fs_1.default.promises.lstat(location_1)];
|
|
@@ -213,36 +213,33 @@ var DynamicExecutor;
|
|
|
213
213
|
return [4 /*yield*/, visitor(location_1)];
|
|
214
214
|
case 5:
|
|
215
215
|
_b.sent();
|
|
216
|
-
return [3 /*break*/,
|
|
216
|
+
return [3 /*break*/, 10];
|
|
217
217
|
case 6:
|
|
218
218
|
if (file.substr(-3) !== ".".concat(extension))
|
|
219
|
-
return [3 /*break*/,
|
|
219
|
+
return [3 /*break*/, 10];
|
|
220
220
|
_b.label = 7;
|
|
221
221
|
case 7: return [4 /*yield*/, (_c = location_1, Promise.resolve().then(function () { return __importStar(require(_c)); }))];
|
|
222
222
|
case 8:
|
|
223
223
|
modulo = _b.sent();
|
|
224
|
-
return [4 /*yield*/, (
|
|
224
|
+
return [4 /*yield*/, executor(location_1, modulo)];
|
|
225
225
|
case 9:
|
|
226
226
|
_b.sent();
|
|
227
|
-
|
|
227
|
+
_b.label = 10;
|
|
228
228
|
case 10:
|
|
229
|
-
_b.sent();
|
|
230
|
-
_b.label = 11;
|
|
231
|
-
case 11:
|
|
232
229
|
directory_1_1 = directory_1.next();
|
|
233
230
|
return [3 /*break*/, 3];
|
|
234
|
-
case
|
|
235
|
-
case
|
|
231
|
+
case 11: return [3 /*break*/, 14];
|
|
232
|
+
case 12:
|
|
236
233
|
e_1_1 = _b.sent();
|
|
237
234
|
e_1 = { error: e_1_1 };
|
|
238
|
-
return [3 /*break*/,
|
|
239
|
-
case
|
|
235
|
+
return [3 /*break*/, 14];
|
|
236
|
+
case 13:
|
|
240
237
|
try {
|
|
241
238
|
if (directory_1_1 && !directory_1_1.done && (_a = directory_1.return)) _a.call(directory_1);
|
|
242
239
|
}
|
|
243
240
|
finally { if (e_1) throw e_1.error; }
|
|
244
241
|
return [7 /*endfinally*/];
|
|
245
|
-
case
|
|
242
|
+
case 14: return [2 /*return*/];
|
|
246
243
|
}
|
|
247
244
|
});
|
|
248
245
|
}); };
|
|
@@ -253,23 +250,25 @@ var DynamicExecutor;
|
|
|
253
250
|
return function (report) {
|
|
254
251
|
return function (assert) {
|
|
255
252
|
return function (location, modulo) { return __awaiter(_this, void 0, void 0, function () {
|
|
256
|
-
var _loop_1, _a, _b, _c,
|
|
253
|
+
var _loop_1, _a, _b, _c, key, closure, state_1, e_2_1;
|
|
254
|
+
var e_2, _d;
|
|
257
255
|
var _this = this;
|
|
258
|
-
return __generator(this, function (
|
|
259
|
-
switch (
|
|
260
|
-
case 0:
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
256
|
+
return __generator(this, function (_e) {
|
|
257
|
+
switch (_e.label) {
|
|
258
|
+
case 0: return [4 /*yield*/, (0, tstl_1.sleep_for)(100)];
|
|
259
|
+
case 1:
|
|
260
|
+
_e.sent();
|
|
261
|
+
_loop_1 = function (key, closure) {
|
|
262
|
+
var func, label, result, _f, exp_1;
|
|
263
|
+
return __generator(this, function (_g) {
|
|
264
|
+
switch (_g.label) {
|
|
265
265
|
case 0:
|
|
266
266
|
if (key.substring(0, options.prefix.length) !== options.prefix)
|
|
267
267
|
return [2 /*return*/, "continue"];
|
|
268
|
-
else if (
|
|
268
|
+
else if (typeof closure !== "function")
|
|
269
269
|
return [2 /*return*/, "continue"];
|
|
270
270
|
else if (options.filter && options.filter(key) === false)
|
|
271
271
|
return [2 /*return*/, "continue"];
|
|
272
|
-
closure = modulo[key];
|
|
273
272
|
func = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
274
273
|
return __generator(this, function (_a) {
|
|
275
274
|
switch (_a.label) {
|
|
@@ -295,26 +294,26 @@ var DynamicExecutor;
|
|
|
295
294
|
time: Date.now(),
|
|
296
295
|
};
|
|
297
296
|
report.executions.push(result);
|
|
298
|
-
|
|
297
|
+
_g.label = 1;
|
|
299
298
|
case 1:
|
|
300
|
-
|
|
299
|
+
_g.trys.push([1, 6, , 7]);
|
|
301
300
|
if (!(options.showElapsedTime === false)) return [3 /*break*/, 3];
|
|
302
301
|
return [4 /*yield*/, func()];
|
|
303
302
|
case 2:
|
|
304
|
-
|
|
303
|
+
_g.sent();
|
|
305
304
|
result.time = Date.now() - result.time;
|
|
306
305
|
console.log(" - ".concat(label));
|
|
307
306
|
return [3 /*break*/, 5];
|
|
308
307
|
case 3:
|
|
309
|
-
|
|
308
|
+
_f = result;
|
|
310
309
|
return [4 /*yield*/, StopWatch_1.StopWatch.measure(func)];
|
|
311
310
|
case 4:
|
|
312
|
-
|
|
311
|
+
_f.time = _g.sent();
|
|
313
312
|
console.log(" - ".concat(label, ": ").concat(chalk_1.default.yellowBright(result.time.toLocaleString()), " ms"));
|
|
314
|
-
|
|
313
|
+
_g.label = 5;
|
|
315
314
|
case 5: return [3 /*break*/, 7];
|
|
316
315
|
case 6:
|
|
317
|
-
exp_1 =
|
|
316
|
+
exp_1 = _g.sent();
|
|
318
317
|
if (!(exp_1 instanceof Error))
|
|
319
318
|
return [2 /*return*/, { value: void 0 }];
|
|
320
319
|
result.time = Date.now() - result.time;
|
|
@@ -327,27 +326,35 @@ var DynamicExecutor;
|
|
|
327
326
|
}
|
|
328
327
|
});
|
|
329
328
|
};
|
|
330
|
-
|
|
331
|
-
_b = [];
|
|
332
|
-
for (_c in _a)
|
|
333
|
-
_b.push(_c);
|
|
334
|
-
_i = 0;
|
|
335
|
-
_d.label = 1;
|
|
336
|
-
case 1:
|
|
337
|
-
if (!(_i < _b.length)) return [3 /*break*/, 4];
|
|
338
|
-
_c = _b[_i];
|
|
339
|
-
if (!(_c in _a)) return [3 /*break*/, 3];
|
|
340
|
-
key = _c;
|
|
341
|
-
return [5 /*yield**/, _loop_1(key)];
|
|
329
|
+
_e.label = 2;
|
|
342
330
|
case 2:
|
|
343
|
-
|
|
331
|
+
_e.trys.push([2, 7, 8, 9]);
|
|
332
|
+
_a = __values(Object.entries(modulo)), _b = _a.next();
|
|
333
|
+
_e.label = 3;
|
|
334
|
+
case 3:
|
|
335
|
+
if (!!_b.done) return [3 /*break*/, 6];
|
|
336
|
+
_c = __read(_b.value, 2), key = _c[0], closure = _c[1];
|
|
337
|
+
return [5 /*yield**/, _loop_1(key, closure)];
|
|
338
|
+
case 4:
|
|
339
|
+
state_1 = _e.sent();
|
|
344
340
|
if (typeof state_1 === "object")
|
|
345
341
|
return [2 /*return*/, state_1.value];
|
|
346
|
-
|
|
347
|
-
case
|
|
348
|
-
|
|
349
|
-
return [3 /*break*/,
|
|
350
|
-
case
|
|
342
|
+
_e.label = 5;
|
|
343
|
+
case 5:
|
|
344
|
+
_b = _a.next();
|
|
345
|
+
return [3 /*break*/, 3];
|
|
346
|
+
case 6: return [3 /*break*/, 9];
|
|
347
|
+
case 7:
|
|
348
|
+
e_2_1 = _e.sent();
|
|
349
|
+
e_2 = { error: e_2_1 };
|
|
350
|
+
return [3 /*break*/, 9];
|
|
351
|
+
case 8:
|
|
352
|
+
try {
|
|
353
|
+
if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
|
|
354
|
+
}
|
|
355
|
+
finally { if (e_2) throw e_2.error; }
|
|
356
|
+
return [7 /*endfinally*/];
|
|
357
|
+
case 9: return [2 /*return*/];
|
|
351
358
|
}
|
|
352
359
|
});
|
|
353
360
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DynamicExecutor.js","sourceRoot":"","sources":["../src/DynamicExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,0CAAoB;AACpB,8CAA4B;
|
|
1
|
+
{"version":3,"file":"DynamicExecutor.js","sourceRoot":"","sources":["../src/DynamicExecutor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nestia/e2e",
|
|
3
|
-
"version": "0.3.1-dev.20230526",
|
|
3
|
+
"version": "0.3.1-dev.20230526-3",
|
|
4
4
|
"description": "E2E test utilify functions",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"ts-node": "^10.9.1",
|
|
41
41
|
"ts-patch": "^2.1.0",
|
|
42
42
|
"typescript": "^4.9.5",
|
|
43
|
-
"typia": "^3.8.
|
|
43
|
+
"typia": "^3.8.4"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"chalk": "^4.1.2",
|
package/src/DynamicExecutor.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
2
|
import fs from "fs";
|
|
3
3
|
import NodePath from "path";
|
|
4
|
-
import { sleep_for } from "tstl";
|
|
5
4
|
|
|
6
5
|
import { StopWatch } from "./StopWatch";
|
|
6
|
+
import { sleep_for } from "tstl";
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Dynamic Executor running prefixed functions.
|
|
@@ -216,7 +216,6 @@ export namespace DynamicExecutor {
|
|
|
216
216
|
} else if (file.substr(-3) !== `.${extension}`) continue;
|
|
217
217
|
|
|
218
218
|
const modulo: Module<Arguments> = await import(location);
|
|
219
|
-
await sleep_for(1);
|
|
220
219
|
await executor(location, modulo);
|
|
221
220
|
}
|
|
222
221
|
};
|
|
@@ -228,14 +227,14 @@ export namespace DynamicExecutor {
|
|
|
228
227
|
(report: IReport) =>
|
|
229
228
|
(assert: boolean) =>
|
|
230
229
|
async (location: string, modulo: Module<Arguments>): Promise<void> => {
|
|
231
|
-
|
|
230
|
+
await sleep_for(100);
|
|
231
|
+
for (const [key, closure] of Object.entries(modulo)) {
|
|
232
232
|
if (key.substring(0, options.prefix.length) !== options.prefix)
|
|
233
233
|
continue;
|
|
234
|
-
else if (
|
|
234
|
+
else if (typeof closure !== "function") continue;
|
|
235
235
|
else if (options.filter && options.filter(key) === false)
|
|
236
236
|
continue;
|
|
237
237
|
|
|
238
|
-
const closure: Closure<Arguments> = modulo[key];
|
|
239
238
|
const func = async () => {
|
|
240
239
|
if (options.wrapper !== undefined)
|
|
241
240
|
await options.wrapper(key, closure);
|