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