@brillout/test-e2e 0.1.6 → 0.1.8

package/dist/buildTs.d.ts

@@ -1,2 +1,4 @@
 export { buildTs };
+export { sourceMaps };
+declare const sourceMaps: Record<string, string>;
 declare function buildTs(entry: string, outfile: string): Promise<() => void>;

package/dist/buildTs.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTs = void 0;
+exports.sourceMaps = exports.buildTs = void 0;
 const esbuild_1 = __importDefault(require("esbuild"));
 const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("./utils");
+const sourceMaps = {};
+exports.sourceMaps = sourceMaps;
 async function buildTs(entry, outfile) {
     await esbuild_1.default.build({
         platform: 'node',
@@ -20,12 +22,16 @@ async function buildTs(entry, outfile) {
         external: ['./node_modules/*', '@brillout/test-e2e'],
         minify: false,
     });
+    {
+        const sourceMapFile = `${outfile}.map`;
+        sourceMaps[outfile] = fs_1.default.readFileSync(sourceMapFile, 'utf8');
+        fs_1.default.unlinkSync(sourceMapFile);
+    }
     const clean = () => {
         if (utils_1.cliConfig.debugEsbuild) {
             return;
         }
         fs_1.default.unlinkSync(`${outfile}`);
-        fs_1.default.unlinkSync(`${outfile}.map`);
     };
     return clean;
 }

package/dist/cli.d.ts

@@ -1 +1 @@
-import 'source-map-support/register';
+export {};

package/dist/cli.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-ignore
-require("source-map-support/register");
+const source_map_support_1 = __importDefault(require("source-map-support"));
 const utils_1 = require("./utils");
 const runTestSuites_1 = require("./runTestSuites");
+const buildTs_1 = require("./buildTs");
+initSourceMap();
 initPromiseRejectionHandler();
 cli();
 function cli() {
@@ -16,3 +20,20 @@ function initPromiseRejectionHandler() {
         process.exit(1);
     });
 }
+function initSourceMap() {
+    source_map_support_1.default.install({
+        retrieveSourceMap: function (source) {
+            const prefix = utils_1.fsWindowsBugWorkaroundPrefix;
+            if (source.startsWith(prefix)) {
+                source = source.slice(prefix.length);
+            }
+            let sourceMap = buildTs_1.sourceMaps[source];
+            if (sourceMap) {
+                return {
+                    map: sourceMap,
+                };
+            }
+            return null;
+        },
+    });
+}

package/dist/getCurrentTest.d.ts

@@ -12,11 +12,11 @@ declare type TestInfo = {
     runInfo?: {
         cmd: string;
         cwd: string;
-        testTimeout: number;
+        testFunctionTimeout: number;
         additionalTimeout: number;
         serverIsReadyMessage?: string;
         serverIsReadyDelay: number;
-        debug: boolean;
+        inspect: boolean;
     };
     hasStartedRunning?: boolean;
     skipped?: string;

package/dist/runTestSuites.js

@@ -16,7 +16,7 @@ async function runTestSuites(filter) {
         const clean = await (0, buildTs_1.buildTs)(testFile, testFileJs);
         (0, getCurrentTest_1.setCurrentTest)(testFile);
         try {
-            await import(workaroundBug(testFileJs));
+            await import((0, utils_1.fsWindowsBugWorkaround)(testFileJs));
         }
         finally {
             clean();
@@ -28,7 +28,3 @@ async function runTestSuites(filter) {
     await browser.close();
 }
 exports.runTestSuites = runTestSuites;
-// https://stackoverflow.com/questions/69665780/error-err-unsupported-esm-url-scheme-only-file-and-data-urls-are-supported-by/70057245#70057245
-function workaroundBug(testFileJs) {
-    return `file://${testFileJs}`;
-}

package/dist/runTests.js

@@ -42,10 +42,10 @@ async function runTests(browser) {
             logSource: 'test()',
             logText: testDesc,
         });
-        const done = (0, utils_1.logProgress)(` | [test] ${testDesc}`);
+        const done = (0, utils_1.logProgress)(`| [test] ${testDesc}`);
         let err;
         try {
-            await runTest(testFn, testInfo.runInfo.testTimeout);
+            await runTest(testFn, testInfo.runInfo.testFunctionTimeout);
         }
         catch (err_) {
             err = err_;
@@ -75,7 +75,7 @@ async function runTests(browser) {
     logTestsResult(true);
 }
 exports.runTests = runTests;
-function runTest(testFn, testTimeout) {
+function runTest(testFn, testFunctionTimeout) {
     let resolve;
     let reject;
     const promise = new Promise((resolve_, reject_) => {
@@ -83,8 +83,8 @@ function runTest(testFn, testTimeout) {
         reject = reject_;
     });
     const timeout = setTimeout(() => {
-        reject(new Error(`[test] Timeout after ${(0, utils_1.humanizeTime)(testTimeout)}`));
-    }, testTimeout);
+        reject(new Error(`[test] Timeout after ${(0, utils_1.humanizeTime)(testFunctionTimeout)}`));
+    }, testFunctionTimeout);
     const ret = testFn();
     (async () => {
         try {
@@ -102,9 +102,9 @@ function runTest(testFn, testTimeout) {
 }
 function logTestsResult(success) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
-    const passStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgGreen)(t));
-    const failStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgRed)(t));
-    const skipStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgYellow)(t));
+    const passStyle = (t) => (0, picocolors_1.bold)((0, picocolors_1.white)((0, picocolors_1.bgGreen)(t)));
+    const failStyle = (t) => (0, picocolors_1.bold)((0, picocolors_1.white)((0, picocolors_1.bgRed)(t)));
+    const skipStyle = (t) => (0, picocolors_1.bold)((0, picocolors_1.white)((0, picocolors_1.bgYellow)(t)));
     if (success) {
         (0, utils_1.assert)(!testInfo.skipped);
         console.log(`${passStyle('PASS')} ${testInfo.testFile}`);

package/dist/setup.d.ts

@@ -17,11 +17,11 @@ export declare let urlBase: string;
 export declare const urlBaseChange: (url: string) => string;
 export { editFile, editFileRevert } from './editFile';
 declare function skip(reason: string): void;
-declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, debug, cwd, }?: {
+declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, inspect, cwd, }?: {
     additionalTimeout?: number;
     serverIsReadyMessage?: string;
     serverIsReadyDelay?: number;
-    debug?: boolean;
+    inspect?: boolean;
     cwd?: string;
 }): void;
 declare function autoRetry(test: () => void | Promise<void>, { timeout }?: {

package/dist/setup.js

@@ -26,10 +26,10 @@ var editFile_2 = require("./editFile");
 Object.defineProperty(exports, "editFile", { enumerable: true, get: function () { return editFile_2.editFile; } });
 Object.defineProperty(exports, "editFileRevert", { enumerable: true, get: function () { return editFile_2.editFileRevert; } });
 const TIMEOUT_NPM_SCRIPT = 30 * 1000 * (!isGithubAction() ? 1 : isLinux() ? 1 : isWindows() ? 5 : 4);
-const TIMEOUT_JEST = 30 * 1000 * (!isGithubAction() ? 1 : isWindows() ? 10 : 6);
+const TIMEOUT_TEST_FUNCTION = 30 * 1000 * (!isGithubAction() ? 1 : isWindows() ? 10 : 6);
 const TIMEOUT_AUTORETRY = 10 * 1000 * (!isGithubAction() || isLinux() ? 1 : 20); // TODO reduce `20`
 const TIMEOUT_PROCESS_TERMINATION = 10 * 1000 * (!isGithubAction() ? 1 : isLinux() ? 1 : 4);
-const TIMEOUT_PLAYWRIGHT = TIMEOUT_JEST;
+const TIMEOUT_PLAYWRIGHT = 20 * 1000 * (!isGithubAction() ? 1 : isWindows() ? 5 : 4);
 function skip(reason) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     testInfo.skipped = reason;
@@ -37,19 +37,19 @@ function skip(reason) {
 exports.skip = skip;
 function run(cmd, { 
 //baseUrl = '',
-additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, debug = utils_1.cliConfig.debug, cwd, } = {}) {
+additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = utils_1.cliConfig.inspect, cwd, } = {}) {
     additionalTimeout += serverIsReadyDelay;
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     testInfo.runInfo = {
         cmd,
         cwd: cwd || getCwd(),
         additionalTimeout,
-        testTimeout: TIMEOUT_JEST + additionalTimeout,
+        testFunctionTimeout: TIMEOUT_TEST_FUNCTION + additionalTimeout,
         serverIsReadyMessage,
         serverIsReadyDelay,
-        debug,
+        inspect,
     };
-    if (debug) {
+    if (inspect) {
         Logs_1.Logs.flushEagerly = true;
     }
     let runProcess = null;
@@ -118,7 +118,7 @@ function getRunInfo() {
 }
 async function start() {
     const { cmd, additionalTimeout, serverIsReadyMessage, serverIsReadyDelay } = getRunInfo();
-    const done = (0, utils_1.logProgress)(` | [run] ${cmd}`);
+    const done = (0, utils_1.logProgress)(`| [run] ${cmd}`);
     let hasSuccessfullyStarted = false;
     let resolveServerStart;
     let rejectServerStart;

package/dist/utils/cliConfig.d.ts

@@ -1,4 +1,4 @@
 export declare const cliConfig: {
     debugEsbuild: boolean;
-    debug: boolean;
+    inspect: boolean;
 };

package/dist/utils/cliConfig.js

@@ -4,5 +4,5 @@ exports.cliConfig = void 0;
 const cliArgs = process.argv.slice(2);
 exports.cliConfig = {
     debugEsbuild: cliArgs.includes('--debug-esbuild'),
-    debug: cliArgs.includes('--debug'),
+    inspect: cliArgs.includes('--inspect'),
 };

package/dist/utils/fsWindowsBugWorkaround.d.ts

@@ -0,0 +1,4 @@
+export { fsWindowsBugWorkaround };
+export { fsWindowsBugWorkaroundPrefix };
+declare const fsWindowsBugWorkaroundPrefix = "file://";
+declare function fsWindowsBugWorkaround(testFileJs: string): string;

package/dist/utils/fsWindowsBugWorkaround.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fsWindowsBugWorkaroundPrefix = exports.fsWindowsBugWorkaround = void 0;
+const fsWindowsBugWorkaroundPrefix = 'file://';
+exports.fsWindowsBugWorkaroundPrefix = fsWindowsBugWorkaroundPrefix;
+// https://stackoverflow.com/questions/69665780/error-err-unsupported-esm-url-scheme-only-file-and-data-urls-are-supported-by/70057245#70057245
+function fsWindowsBugWorkaround(testFileJs) {
+    return `${fsWindowsBugWorkaroundPrefix}${testFileJs}`;
+}
+exports.fsWindowsBugWorkaround = fsWindowsBugWorkaround;

package/dist/utils/index.d.ts

@@ -6,3 +6,4 @@ export * from './isTTY';
 export * from './findFiles';
 export * from './logProgress';
 export * from './cliConfig';
+export * from './fsWindowsBugWorkaround';

package/dist/utils/index.js

@@ -22,3 +22,4 @@ __exportStar(require("./isTTY"), exports);
 __exportStar(require("./findFiles"), exports);
 __exportStar(require("./logProgress"), exports);
 __exportStar(require("./cliConfig"), exports);
+__exportStar(require("./fsWindowsBugWorkaround"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "scripts": {
@@ -27,6 +27,7 @@
     "@types/chai": "^4.3.3",
     "@types/node": "^15.6.1",
     "@types/node-fetch": "^2.5.12",
+    "@types/source-map-support": "^0.5.6",
     "typescript": "^4.8.3"
   },
   "repository": "github:brillout/test-e2e",