testplane 8.40.1 → 8.40.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/build/package.json +7 -7
- package/build/src/browser/cdp/selectivity/hash-writer.js +16 -31
- package/build/src/browser/cdp/selectivity/hash-writer.js.map +1 -1
- package/build/src/browser/cdp/selectivity/json-utils.js +8 -6
- package/build/src/browser/cdp/selectivity/json-utils.js.map +1 -1
- package/build/src/browser/cdp/selectivity/utils.d.ts +1 -1
- package/build/src/browser/cdp/selectivity/utils.js +2 -2
- package/build/src/browser/cdp/selectivity/utils.js.map +1 -1
- package/build/src/browser-pool/cancelled-error.js +7 -1
- package/build/src/browser-pool/cancelled-error.js.map +1 -1
- package/build/src/browser-pool/limited-pool.d.ts +1 -1
- package/build/src/browser-pool/limited-pool.js +3 -3
- package/build/src/browser-pool/limited-pool.js.map +1 -1
- package/build/src/browser-pool/per-browser-limited-pool.d.ts +1 -1
- package/build/src/browser-pool/per-browser-limited-pool.js +3 -2
- package/build/src/browser-pool/per-browser-limited-pool.js.map +1 -1
- package/build/src/browser-pool/types.d.ts +1 -1
- package/build/src/cli/index.js +4 -2
- package/build/src/cli/index.js.map +1 -1
- package/build/src/constants/process-messages.d.ts +1 -0
- package/build/src/constants/process-messages.js +2 -1
- package/build/src/constants/process-messages.js.map +1 -1
- package/build/src/error-snippets/source-maps.d.ts +3 -3
- package/build/src/error-snippets/source-maps.js +7 -5
- package/build/src/error-snippets/source-maps.js.map +1 -1
- package/build/src/errors/unhandled-rejection-error.d.ts +9 -0
- package/build/src/errors/unhandled-rejection-error.js +24 -0
- package/build/src/errors/unhandled-rejection-error.js.map +1 -0
- package/build/src/events/index.d.ts +4 -0
- package/build/src/events/index.js +1 -0
- package/build/src/events/index.js.map +1 -1
- package/build/src/reporters/flat.js +7 -5
- package/build/src/reporters/flat.js.map +1 -1
- package/build/src/reporters/informers/console.d.ts +3 -3
- package/build/src/reporters/informers/console.js +6 -6
- package/build/src/reporters/informers/console.js.map +1 -1
- package/build/src/reporters/informers/file.d.ts +3 -3
- package/build/src/reporters/informers/file.js +13 -6
- package/build/src/reporters/informers/file.js.map +1 -1
- package/build/src/reporters/plain.js +4 -2
- package/build/src/reporters/plain.js.map +1 -1
- package/build/src/runner/browser-env/vite/browser-modules/tsconfig.tsbuildinfo +1 -1
- package/build/src/runner/browser-runner.d.ts +1 -1
- package/build/src/runner/browser-runner.js +2 -2
- package/build/src/runner/browser-runner.js.map +1 -1
- package/build/src/runner/index.d.ts +1 -1
- package/build/src/runner/index.js +7 -4
- package/build/src/runner/index.js.map +1 -1
- package/build/src/runner/test-runner/insistant-test-runner.d.ts +1 -0
- package/build/src/runner/tests-tracker.d.ts +25 -0
- package/build/src/runner/tests-tracker.js +121 -0
- package/build/src/runner/tests-tracker.js.map +1 -0
- package/build/src/runner/types.d.ts +1 -1
- package/build/src/testplane.d.ts +4 -1
- package/build/src/testplane.js +37 -4
- package/build/src/testplane.js.map +1 -1
- package/build/src/types/index.d.ts +8 -0
- package/build/src/utils/ipc.d.ts +1 -1
- package/build/src/utils/ipc.js +15 -1
- package/build/src/utils/ipc.js.map +1 -1
- package/build/src/utils/logger.d.ts +9 -0
- package/build/src/utils/logger.js +27 -3
- package/build/src/utils/logger.js.map +1 -1
- package/build/src/utils/processor.js +11 -3
- package/build/src/utils/processor.js.map +1 -1
- package/build/src/utils/workers-registry.js +42 -3
- package/build/src/utils/workers-registry.js.map +1 -1
- package/build/src/worker/runner/index.js +9 -0
- package/build/src/worker/runner/index.js.map +1 -1
- package/package.json +7 -7
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testplane",
|
|
3
|
-
"version": "8.40.
|
|
3
|
+
"version": "8.40.3",
|
|
4
4
|
"description": "Tests framework based on mocha and wdio",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"files": [
|
|
@@ -69,10 +69,10 @@
|
|
|
69
69
|
"@jspm/core": "2.0.1",
|
|
70
70
|
"@jsquash/png": "3.1.1",
|
|
71
71
|
"@puppeteer/browsers": "2.7.1",
|
|
72
|
-
"@testplane/devtools": "8.32.
|
|
73
|
-
"@testplane/wdio-protocols": "9.4.
|
|
74
|
-
"@testplane/wdio-utils": "9.5.
|
|
75
|
-
"@testplane/webdriverio": "9.5.
|
|
72
|
+
"@testplane/devtools": "8.32.5",
|
|
73
|
+
"@testplane/wdio-protocols": "9.4.7",
|
|
74
|
+
"@testplane/wdio-utils": "9.5.4",
|
|
75
|
+
"@testplane/webdriverio": "9.5.23",
|
|
76
76
|
"@vitest/spy": "2.1.4",
|
|
77
77
|
"buffer-crc32": "1.0.0",
|
|
78
78
|
"chalk": "2.4.2",
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
"sizzle": "2.3.6",
|
|
105
105
|
"socket.io": "4.7.5",
|
|
106
106
|
"socket.io-client": "4.7.5",
|
|
107
|
-
"source-map": "
|
|
107
|
+
"source-map-js": "1.2.1",
|
|
108
108
|
"strftime": "0.10.2",
|
|
109
109
|
"strip-ansi": "6.0.1",
|
|
110
110
|
"temp": "0.8.3",
|
|
@@ -125,7 +125,7 @@
|
|
|
125
125
|
"@rrweb/record": "2.0.0-alpha.18",
|
|
126
126
|
"@sinonjs/fake-timers": "10.3.0",
|
|
127
127
|
"@swc/core": "1.13.3",
|
|
128
|
-
"@testplane/wdio-types": "9.5.
|
|
128
|
+
"@testplane/wdio-types": "9.5.4",
|
|
129
129
|
"@types/babel__code-frame": "7.0.6",
|
|
130
130
|
"@types/browserify": "12.0.40",
|
|
131
131
|
"@types/chai": "4.3.4",
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.getHashWriter = exports.HashWriter = void 0;
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
-
const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
|
|
10
9
|
const hash_provider_1 = require("./hash-provider");
|
|
11
10
|
const utils_1 = require("./utils");
|
|
12
11
|
const json_utils_1 = require("./json-utils");
|
|
@@ -101,37 +100,23 @@ class HashWriter {
|
|
|
101
100
|
...Object.values(this._stagedModuleHashes),
|
|
102
101
|
...Object.values(this._stagedPatternHashes),
|
|
103
102
|
]);
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
const [updatedModules, updatedFiles, updatedPatterns] = await Promise.all([
|
|
113
|
-
filterMatchingHashes(stagedModuleNames, this._stagedModuleHashes, existingHashesContent.modules),
|
|
114
|
-
filterMatchingHashes(stagedFileNames, this._stagedFileHashes, existingHashesContent.files),
|
|
115
|
-
filterMatchingHashes(stagedPatternNames, this._stagedPatternHashes, existingHashesContent.patterns),
|
|
116
|
-
]);
|
|
117
|
-
if (!updatedFiles.length && !updatedModules.length && !updatedPatterns.length) {
|
|
118
|
-
await releaseLock();
|
|
119
|
-
return;
|
|
120
|
-
}
|
|
121
|
-
await Promise.all([
|
|
122
|
-
writeTo(updatedModules, this._stagedModuleHashes, existingHashesContent.modules),
|
|
123
|
-
writeTo(updatedFiles, this._stagedFileHashes, existingHashesContent.files),
|
|
124
|
-
writeTo(updatedPatterns, this._stagedPatternHashes, existingHashesContent.patterns),
|
|
125
|
-
]);
|
|
126
|
-
await (0, json_utils_1.writeJsonWithCompression)(this._selectivityHashesPath, existingHashesContent, this._compresion);
|
|
127
|
-
await releaseLock();
|
|
128
|
-
markAsCommited(updatedModules, this._stagedModuleHashes);
|
|
129
|
-
markAsCommited(updatedFiles, this._stagedFileHashes);
|
|
130
|
-
}
|
|
131
|
-
catch (err) {
|
|
132
|
-
await releaseLock();
|
|
133
|
-
throw err;
|
|
103
|
+
const existingHashesContent = await (0, utils_1.readHashFileContents)(this._selectivityHashesPath, this._compresion);
|
|
104
|
+
const [updatedModules, updatedFiles, updatedPatterns] = await Promise.all([
|
|
105
|
+
filterMatchingHashes(stagedModuleNames, this._stagedModuleHashes, existingHashesContent.modules),
|
|
106
|
+
filterMatchingHashes(stagedFileNames, this._stagedFileHashes, existingHashesContent.files),
|
|
107
|
+
filterMatchingHashes(stagedPatternNames, this._stagedPatternHashes, existingHashesContent.patterns),
|
|
108
|
+
]);
|
|
109
|
+
if (!updatedFiles.length && !updatedModules.length && !updatedPatterns.length) {
|
|
110
|
+
return;
|
|
134
111
|
}
|
|
112
|
+
await Promise.all([
|
|
113
|
+
writeTo(updatedModules, this._stagedModuleHashes, existingHashesContent.modules),
|
|
114
|
+
writeTo(updatedFiles, this._stagedFileHashes, existingHashesContent.files),
|
|
115
|
+
writeTo(updatedPatterns, this._stagedPatternHashes, existingHashesContent.patterns),
|
|
116
|
+
]);
|
|
117
|
+
await (0, json_utils_1.writeJsonWithCompression)(this._selectivityHashesPath, existingHashesContent, this._compresion);
|
|
118
|
+
markAsCommited(updatedModules, this._stagedModuleHashes);
|
|
119
|
+
markAsCommited(updatedFiles, this._stagedFileHashes);
|
|
135
120
|
}
|
|
136
121
|
}
|
|
137
122
|
exports.HashWriter = HashWriter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-writer.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-writer.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAiC;AACjC,0DAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"hash-writer.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/hash-writer.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAiC;AACjC,0DAA6B;AAC7B,mDAA+C;AAC/C,mCAA4F;AAC5F,6CAAwD;AAGxD,MAAa,UAAU;IASnB,YAAY,oBAA4B,EAAE,WAAuC;QARhE,kBAAa,GAAG,IAAI,4BAAY,EAAE,CAAC;QACpD,gHAAgH;QAC/F,sBAAiB,GAAG,IAAI,GAAG,EAA0C,CAAC;QACtE,wBAAmB,GAAG,IAAI,GAAG,EAA0C,CAAC;QACxE,yBAAoB,GAAG,IAAI,GAAG,EAA0C,CAAC;QAKtF,IAAI,CAAC,sBAAsB,GAAG,IAAA,gCAAwB,EAAC,oBAAoB,CAAC,CAAC;QAC7E,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAEO,kBAAkB,CAAC,QAAgB;QACvC,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,OAAO;QACX,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAE9E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAEO,qBAAqB,CAAC,OAAe;QACzC,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,OAAO;QACX,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAEhF,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAEO,oBAAoB,CAAC,UAAkB;QAC3C,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,OAAO;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAE9E,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,wBAAwB,CAAC,kBAA0B;QAC/C,OAAO,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;IAC1D,CAAC;IAED,uBAAuB,CAAC,YAAoC;QACxD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5E,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3E,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,SAAS,GAAG,OAAO,CACrB,IAAI,CAAC,iBAAiB,CAAC,IAAI,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,IAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,CACjG,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO;QACX,CAAC;QAED,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;QACtE,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC;QAExE,MAAM,oBAAoB,GAAG,KAAK,EAC9B,IAAc,EACd,GAAgD,EAChD,IAA4B,EACX,EAAE;YACnB,MAAM,aAAa,GAAa,EAAE,CAAC;YAEnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAEpC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBACpB,SAAS;gBACb,CAAC;gBAED,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACxB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACJ,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5B,CAAC;YACL,CAAC;YAED,OAAO,aAAa,CAAC;QACzB,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,KAAK,EACjB,IAAc,EACd,GAAgD,EAChD,IAA4B,EACf,EAAE;YACf,IAAI,WAAW,GAAG,KAAK,CAAC;YAExB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACrB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAEhC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACR,SAAS;gBACb,CAAC;gBAED,IAAI,IAAI,YAAY,KAAK,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC;gBACf,CAAC;gBAED,WAAW,GAAG,WAAW,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAEvD,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YACrB,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBACd,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,CAAC,IAAc,EAAE,GAAgD,EAAQ,EAAE;YAC9F,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC;QAEF,8EAA8E;QAC9E,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;YACxC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC;YAC1C,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC;SAC9C,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAG,MAAM,IAAA,4BAAoB,EAAC,IAAI,CAAC,sBAAsB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAExG,MAAM,CAAC,cAAc,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtE,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,OAAO,CAAC;YAChG,oBAAoB,CAAC,eAAe,EAAE,IAAI,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,KAAK,CAAC;YAC1F,oBAAoB,CAAC,kBAAkB,EAAE,IAAI,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,QAAQ,CAAC;SACtG,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YAC5E,OAAO;QACX,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,OAAO,CAAC;YAChF,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,KAAK,CAAC;YAC1E,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,QAAQ,CAAC;SACtF,CAAC,CAAC;QAEH,MAAM,IAAA,qCAAwB,EAAC,IAAI,CAAC,sBAAsB,EAAE,qBAAqB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAErG,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACzD,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;CACJ;AA3JD,gCA2JC;AAEY,QAAA,aAAa,GAAG,IAAA,gBAAO,EAChC,CAAC,oBAA4B,EAAE,WAAuC,EAAc,EAAE;IAClF,OAAO,IAAI,UAAU,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;AAC7D,CAAC,EACD,CAAC,oBAAoB,EAAE,WAAW,EAAE,EAAE,CAAC,GAAG,oBAAoB,IAAI,WAAW,EAAE,CAClF,CAAC"}
|
|
@@ -4,8 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.writeJsonWithCompression = exports.readJsonWithCompression = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
8
|
const node_zlib_1 = __importDefault(require("node:zlib"));
|
|
9
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
9
10
|
const types_1 = require("./types");
|
|
10
11
|
const getCompressionPrefix = (type) => (type === "none" ? "" : "." + type);
|
|
11
12
|
const compressionPriorities = process.versions.zstd
|
|
@@ -13,7 +14,7 @@ const compressionPriorities = process.versions.zstd
|
|
|
13
14
|
: [types_1.Compression.GZIP, types_1.Compression.BROTLI, types_1.Compression.NONE];
|
|
14
15
|
const getExistingJsonPathWithCompression = (jsonBasePath, preferredCompressionType) => {
|
|
15
16
|
const jsonPathWithPrefix = jsonBasePath + getCompressionPrefix(preferredCompressionType);
|
|
16
|
-
if (
|
|
17
|
+
if (fs_extra_1.default.existsSync(jsonPathWithPrefix)) {
|
|
17
18
|
return { jsonPath: jsonPathWithPrefix, compressionType: preferredCompressionType };
|
|
18
19
|
}
|
|
19
20
|
for (const compressionType of compressionPriorities) {
|
|
@@ -21,7 +22,7 @@ const getExistingJsonPathWithCompression = (jsonBasePath, preferredCompressionTy
|
|
|
21
22
|
continue;
|
|
22
23
|
}
|
|
23
24
|
const jsonPathWithCurrentPrefix = jsonBasePath + getCompressionPrefix(compressionType);
|
|
24
|
-
if (
|
|
25
|
+
if (fs_extra_1.default.existsSync(jsonPathWithCurrentPrefix)) {
|
|
25
26
|
return { jsonPath: jsonPathWithCurrentPrefix, compressionType: compressionType };
|
|
26
27
|
}
|
|
27
28
|
}
|
|
@@ -30,7 +31,7 @@ const getExistingJsonPathWithCompression = (jsonBasePath, preferredCompressionTy
|
|
|
30
31
|
const readCompressedTextFile = (filePath, compression) => {
|
|
31
32
|
return new Promise((resolve, reject) => {
|
|
32
33
|
let fileData = "";
|
|
33
|
-
const readStream =
|
|
34
|
+
const readStream = fs_extra_1.default.createReadStream(filePath);
|
|
34
35
|
let stream = readStream;
|
|
35
36
|
if (compression === types_1.Compression.ZSTD && !("createZstdDecompress" in node_zlib_1.default)) {
|
|
36
37
|
reject(new Error("zstd decompression is not supported in your version of node.js. Please, upgrade the node version to 22"));
|
|
@@ -60,7 +61,7 @@ const readCompressedTextFile = (filePath, compression) => {
|
|
|
60
61
|
};
|
|
61
62
|
const writeCompressedTextFile = (filePath, data, compression) => {
|
|
62
63
|
return new Promise((resolve, reject) => {
|
|
63
|
-
const writeStream =
|
|
64
|
+
const writeStream = fs_extra_1.default.createWriteStream(filePath);
|
|
64
65
|
let stream = writeStream;
|
|
65
66
|
if (compression === types_1.Compression.ZSTD && !("createZstdCompress" in node_zlib_1.default)) {
|
|
66
67
|
reject(new Error("zstd compression is not supported in your version of node.js. Please, upgrade the node version to 22"));
|
|
@@ -114,9 +115,10 @@ const readJsonWithCompression = async (jsonBasePath, preferredCompressionType, o
|
|
|
114
115
|
return JSON.parse(fileData);
|
|
115
116
|
};
|
|
116
117
|
exports.readJsonWithCompression = readJsonWithCompression;
|
|
117
|
-
const writeJsonWithCompression = (jsonBasePath, data, preferredCompressionType) => {
|
|
118
|
+
const writeJsonWithCompression = async (jsonBasePath, data, preferredCompressionType) => {
|
|
118
119
|
const filePath = jsonBasePath + getCompressionPrefix(preferredCompressionType);
|
|
119
120
|
const fileData = JSON.stringify(data, null, preferredCompressionType === "none" ? 2 : 0);
|
|
121
|
+
await fs_extra_1.default.ensureDir(node_path_1.default.dirname(filePath));
|
|
120
122
|
return writeCompressedTextFile(filePath, fileData, preferredCompressionType);
|
|
121
123
|
};
|
|
122
124
|
exports.writeJsonWithCompression = writeJsonWithCompression;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-utils.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/json-utils.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"json-utils.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/json-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type RawSourceMap } from "source-map";
|
|
1
|
+
import { type RawSourceMap } from "source-map-js";
|
|
2
2
|
import type { CDPRuntime } from "../domains/runtime";
|
|
3
3
|
import type { CDPSessionId } from "../types";
|
|
4
4
|
import type { HashFileContents, NormalizedDependencies, SelectivityCompressionType } from "./types";
|
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.readTestDependencies = exports.getTestDependenciesPath = exports.getSelectivityTestsPath = exports.readHashFileContents = exports.getSelectivityHashesPath = exports.shallowSortObject = exports.mergeSourceDependencies = exports.transformSourceDependencies = exports.hasProtocol = exports.extractSourceFilesDeps = exports.patchSourceMapSources = exports.fetchTextWithBrowserFallback = void 0;
|
|
30
30
|
const lodash_1 = require("lodash");
|
|
31
|
-
const
|
|
31
|
+
const source_map_js_1 = require("source-map-js");
|
|
32
32
|
const fs_1 = __importDefault(require("fs"));
|
|
33
33
|
const path_1 = __importDefault(require("path"));
|
|
34
34
|
const url_1 = require("url");
|
|
@@ -99,7 +99,7 @@ exports.patchSourceMapSources = patchSourceMapSources;
|
|
|
99
99
|
const extractSourceFilesDeps = async (source, sourceMaps, startOffsets, sourceRoot) => {
|
|
100
100
|
const dependantSourceFiles = new Set();
|
|
101
101
|
const sourceMapsParsed = (0, exports.patchSourceMapSources)(JSON.parse(sourceMaps), sourceRoot);
|
|
102
|
-
const consumer =
|
|
102
|
+
const consumer = new source_map_js_1.SourceMapConsumer(sourceMapsParsed);
|
|
103
103
|
let sourceOffset = source.indexOf("\n");
|
|
104
104
|
const offsetToLine = [0];
|
|
105
105
|
while (sourceOffset !== -1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/browser/cdp/selectivity/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,13 @@ class CancelledError extends Error {
|
|
|
8
8
|
constructor() {
|
|
9
9
|
super();
|
|
10
10
|
this.name = "CancelledError";
|
|
11
|
-
this.message =
|
|
11
|
+
this.message = `Browser request was cancelled
|
|
12
|
+
|
|
13
|
+
What happened:
|
|
14
|
+
- This test tried to run in a browser that was already stopped
|
|
15
|
+
- This likely happened due to a critical error, like an unhandled promise rejection
|
|
16
|
+
What you can do:
|
|
17
|
+
- Check other failed tests or execution logs for more details, usually you can find the root cause there`;
|
|
12
18
|
Error.captureStackTrace(this, CancelledError);
|
|
13
19
|
}
|
|
14
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancelled-error.js","sourceRoot":"","sources":["../../../src/browser-pool/cancelled-error.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,cAAe,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"cancelled-error.js","sourceRoot":"","sources":["../../../src/browser-pool/cancelled-error.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,cAAe,SAAQ,KAAK;IAUrC;QACI,KAAK,EAAE,CAAC;QAVZ,SAAI,GAAG,gBAAgB,CAAC;QACxB,YAAO,GAAG;;;;;;yGAM2F,CAAC;QAIlG,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAClD,CAAC;CACJ;AAdD,wCAcC"}
|
|
@@ -18,7 +18,7 @@ export declare class LimitedPool implements Pool {
|
|
|
18
18
|
constructor(underlyingPool: Pool, opts: LimitedPoolOpts);
|
|
19
19
|
getBrowser(id: string, opts?: BrowserOpts): Promise<Browser>;
|
|
20
20
|
freeBrowser(browser: Browser, opts?: BrowserOpts): Promise<void>;
|
|
21
|
-
cancel(): void;
|
|
21
|
+
cancel(error?: Error): void;
|
|
22
22
|
private _getBrowser;
|
|
23
23
|
private _newBrowser;
|
|
24
24
|
private _lookAtNextRequest;
|
|
@@ -48,14 +48,14 @@ class LimitedPool {
|
|
|
48
48
|
this.log(`free browser ${browser.fullId} with opts:${JSON.stringify(optsForFree)}`);
|
|
49
49
|
return this.underlyingPool.freeBrowser(browser, optsForFree).finally(() => this._launchNextBrowser());
|
|
50
50
|
}
|
|
51
|
-
cancel() {
|
|
51
|
+
cancel(error = new cancelled_error_1.CancelledError()) {
|
|
52
52
|
this.log("cancel");
|
|
53
|
-
const reject_ = (entry) => entry.reject(
|
|
53
|
+
const reject_ = (entry) => entry.reject(error);
|
|
54
54
|
this._highPriorityRequestQueue.forEach(reject_);
|
|
55
55
|
this._requestQueue.forEach(reject_);
|
|
56
56
|
this._highPriorityRequestQueue = yallist_1.default.create();
|
|
57
57
|
this._requestQueue = yallist_1.default.create();
|
|
58
|
-
this.underlyingPool.cancel();
|
|
58
|
+
this.underlyingPool.cancel(error);
|
|
59
59
|
}
|
|
60
60
|
async _getBrowser(id, opts = {}) {
|
|
61
61
|
if (this._launched < this._limit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAAuB;AACvB,sDAA8B;AAG9B,uDAAmD;AACnD,mCAAkD;AAkBlD,MAAa,WAAW;IAUpB,MAAM,CAAC,MAAM,CAAC,cAAoB,EAAE,IAAqB;QACrD,OAAO,IAAI,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,YAAY,cAAoB,EAAE,IAAqB;QACnD,IAAI,CAAC,GAAG,GAAG,IAAA,eAAK,EAAC,wBAAwB,CAAC,CAAC;QAE3C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,aAAa,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;QACtC,IAAI,CAAC,yBAAyB,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;QAClD,IAAI,CAAC,yBAAyB,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC;YACvE,CAAC,CAAC,IAAI,CAAC,wBAAwB;YAC/B,CAAC,CAAC,IAAI,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,OAAoB,EAAE;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,cAAc,WAAW,cAAc,IAAI,CAAC,SAAS,WAAW,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAE1G,EAAE,IAAI,CAAC,SAAS,CAAC;QACjB,IAAI,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,EAAE,IAAI,CAAC,SAAS,CAAC;YACjB,OAAO,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAgB,EAAE,OAAoB,EAAE;QACtD,EAAE,IAAI,CAAC,SAAS,CAAC;QAEjB,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9C,MAAM,yBAAyB,GAC3B,WAAW,IAAI,IAAA,+BAAuB,EAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrF,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;QAClD,MAAM,wBAAwB,GAAG,IAAI,CAAC,yBAAyB,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACnG,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,wBAAwB,CAAC;QACrD,MAAM,WAAW,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE,YAAY,EAAE,CAAC;QAEvE,IAAI,CAAC,GAAG,CAAC,gBAAgB,OAAO,CAAC,MAAM,cAAc,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAEpF,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC1G,CAAC;IAED,MAAM;
|
|
1
|
+
{"version":3,"file":"limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/limited-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,5 @@ export declare class PerBrowserLimitedPool implements Pool {
|
|
|
8
8
|
constructor(underlyingPool: Pool, config: Config);
|
|
9
9
|
getBrowser(id: string, opts?: object): Promise<Browser>;
|
|
10
10
|
freeBrowser(browser: Browser, opts?: object): Promise<void>;
|
|
11
|
-
cancel(): void;
|
|
11
|
+
cancel(error?: Error): void;
|
|
12
12
|
}
|
|
@@ -7,6 +7,7 @@ exports.PerBrowserLimitedPool = void 0;
|
|
|
7
7
|
const debug_1 = __importDefault(require("debug"));
|
|
8
8
|
const lodash_1 = require("lodash");
|
|
9
9
|
const limited_pool_1 = require("./limited-pool");
|
|
10
|
+
const cancelled_error_1 = require("./cancelled-error");
|
|
10
11
|
class PerBrowserLimitedPool {
|
|
11
12
|
constructor(underlyingPool, config) {
|
|
12
13
|
this.log = (0, debug_1.default)("testplane:pool:per-browser-limited");
|
|
@@ -23,9 +24,9 @@ class PerBrowserLimitedPool {
|
|
|
23
24
|
this.log(`free ${browser.fullId}`);
|
|
24
25
|
return this._browserPools[browser.id].freeBrowser(browser, opts);
|
|
25
26
|
}
|
|
26
|
-
cancel() {
|
|
27
|
+
cancel(error = new cancelled_error_1.CancelledError()) {
|
|
27
28
|
this.log("cancel");
|
|
28
|
-
(0, lodash_1.forEach)(this._browserPools, pool => pool.cancel());
|
|
29
|
+
(0, lodash_1.forEach)(this._browserPools, pool => pool.cancel(error));
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
32
|
exports.PerBrowserLimitedPool = PerBrowserLimitedPool;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"per-browser-limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/per-browser-limited-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAA4C;AAK5C,iDAA6C;
|
|
1
|
+
{"version":3,"file":"per-browser-limited-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/per-browser-limited-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAA4C;AAK5C,iDAA6C;AAC7C,uDAAmD;AAEnD,MAAa,qBAAqB;IAI9B,YAAY,cAAoB,EAAE,MAAc;QAC5C,IAAI,CAAC,GAAG,GAAG,IAAA,eAAK,EAAC,oCAAoC,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,IAAA,kBAAS,EAC1B,GAAG,EACH,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACT,0BAAW,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,kBAAkB;SAClD,CAAC,CACL,CACJ,CAAC;IACN,CAAC;IAED,UAAU,CAAC,EAAU,EAAE,IAAa;QAChC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,WAAW,CAAC,OAAgB,EAAE,IAAa;QACvC,IAAI,CAAC,GAAG,CAAC,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,QAAe,IAAI,gCAAc,EAAE;QACtC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAA,gBAAO,EAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;CACJ;AAlCD,sDAkCC"}
|
|
@@ -2,7 +2,7 @@ import { Browser } from "../browser/browser";
|
|
|
2
2
|
export interface Pool<T extends Browser = Browser> {
|
|
3
3
|
getBrowser(id: string, opts?: object): Promise<T>;
|
|
4
4
|
freeBrowser(browser: T, opts?: object): Promise<void>;
|
|
5
|
-
cancel(): void;
|
|
5
|
+
cancel(error?: Error): void;
|
|
6
6
|
}
|
|
7
7
|
export interface BrowserOpts {
|
|
8
8
|
force?: boolean;
|
package/build/src/cli/index.js
CHANGED
|
@@ -44,14 +44,16 @@ process.on("uncaughtException", err => {
|
|
|
44
44
|
logger.error((0, secret_replacer_1.utilInspectSafe)(err));
|
|
45
45
|
process.exit(1);
|
|
46
46
|
});
|
|
47
|
-
process.on("unhandledRejection",
|
|
47
|
+
process.on("unhandledRejection", reason => {
|
|
48
|
+
// This flag lets other unhandledRejection handlers know that we already processed it on Testplane side.
|
|
49
|
+
// Currently we use this to avoid duplicate error logging and force shutdown in HTML Reporter.
|
|
50
|
+
global["__TESTPLANE_INTERNAL_UNHANDLED_REJECTION_PROCESSED"] = true;
|
|
48
51
|
if ((0, errors_1.shouldIgnoreUnhandledRejection)(reason)) {
|
|
49
52
|
logger.warn(`Unhandled Rejection "${reason}" in testplane:master:${process.pid} was ignored`);
|
|
50
53
|
return;
|
|
51
54
|
}
|
|
52
55
|
const error = [
|
|
53
56
|
`Unhandled Rejection in testplane:master:${process.pid}:`,
|
|
54
|
-
`Promise: ${(0, secret_replacer_1.utilInspectSafe)(p)}`,
|
|
55
57
|
`Reason: ${(0, secret_replacer_1.utilInspectSafe)(reason)}`,
|
|
56
58
|
].join("\n");
|
|
57
59
|
if (testplane) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA6B;AAC7B,yDAAoD;AACpD,wDAA+B;AAE/B,kEAA0C;AAC1C,iCAA0C;AAC1C,4CAAyC;AACzC,sEAAqC;AACrC,wDAA0C;AAC1C,4CAAiE;AACjE,8DAA2D;AAC3D,sCAAsF;AACtF,2CAA0C;AAI1C,IAAI,SAAoB,CAAC;AAEzB,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,CAAC,EAAE;IAClC,MAAM,CAAC,KAAK,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC;IACnC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,3 +3,4 @@ export declare const MASTER_SYNC_CONFIG = "master.syncConfig";
|
|
|
3
3
|
export declare const WORKER_INIT = "worker.init";
|
|
4
4
|
export declare const WORKER_SYNC_CONFIG = "worker.syncConfig";
|
|
5
5
|
export declare const WORKER_UNHANDLED_REJECTION = "worker.unhandledRejection";
|
|
6
|
+
export declare const TEST_ASSIGNED_TO_WORKER = "worker.testAssignedToWorker";
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.WORKER_UNHANDLED_REJECTION = exports.WORKER_SYNC_CONFIG = exports.WORKER_INIT = exports.MASTER_SYNC_CONFIG = exports.MASTER_INIT = void 0;
|
|
3
|
+
exports.TEST_ASSIGNED_TO_WORKER = exports.WORKER_UNHANDLED_REJECTION = exports.WORKER_SYNC_CONFIG = exports.WORKER_INIT = exports.MASTER_SYNC_CONFIG = exports.MASTER_INIT = void 0;
|
|
4
4
|
exports.MASTER_INIT = "master.init";
|
|
5
5
|
exports.MASTER_SYNC_CONFIG = "master.syncConfig";
|
|
6
6
|
exports.WORKER_INIT = "worker.init";
|
|
7
7
|
exports.WORKER_SYNC_CONFIG = "worker.syncConfig";
|
|
8
8
|
exports.WORKER_UNHANDLED_REJECTION = "worker.unhandledRejection";
|
|
9
|
+
exports.TEST_ASSIGNED_TO_WORKER = "worker.testAssignedToWorker";
|
|
9
10
|
//# sourceMappingURL=process-messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-messages.js","sourceRoot":"","sources":["../../../src/constants/process-messages.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,aAAa,CAAC;AAC5B,QAAA,kBAAkB,GAAG,mBAAmB,CAAC;AAEzC,QAAA,WAAW,GAAG,aAAa,CAAC;AAC5B,QAAA,kBAAkB,GAAG,mBAAmB,CAAC;AACzC,QAAA,0BAA0B,GAAG,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"process-messages.js","sourceRoot":"","sources":["../../../src/constants/process-messages.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,aAAa,CAAC;AAC5B,QAAA,kBAAkB,GAAG,mBAAmB,CAAC;AAEzC,QAAA,WAAW,GAAG,aAAa,CAAC;AAC5B,QAAA,kBAAkB,GAAG,mBAAmB,CAAC;AACzC,QAAA,0BAA0B,GAAG,2BAA2B,CAAC;AACzD,QAAA,uBAAuB,GAAG,6BAA6B,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SourceMapConsumer } from "source-map-js";
|
|
2
2
|
import type { SufficientStackFrame, ResolvedFrame } from "./types";
|
|
3
|
-
export declare const extractSourceMaps: (fileContents: string, fileName: string) => Promise<
|
|
4
|
-
export declare const resolveLocationWithSourceMap: (stackFrame: SufficientStackFrame, sourceMaps:
|
|
3
|
+
export declare const extractSourceMaps: (fileContents: string, fileName: string) => Promise<SourceMapConsumer | null>;
|
|
4
|
+
export declare const resolveLocationWithSourceMap: (stackFrame: SufficientStackFrame, sourceMaps: SourceMapConsumer) => ResolvedFrame;
|
|
@@ -4,14 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.resolveLocationWithSourceMap = exports.extractSourceMaps = void 0;
|
|
7
|
-
const
|
|
7
|
+
const source_map_js_1 = require("source-map-js");
|
|
8
8
|
const url_1 = __importDefault(require("url"));
|
|
9
9
|
const constants_1 = require("./constants");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
const fs_1 = require("../utils/fs");
|
|
12
12
|
const typescript_1 = require("../utils/typescript");
|
|
13
13
|
const extractSourceMaps = async (fileContents, fileName) => {
|
|
14
|
-
|
|
14
|
+
const hasNoSourceMaps = fileContents.indexOf(constants_1.JS_SOURCE_MAP_URL_COMMENT) === -1;
|
|
15
|
+
const isEsmFile = fileName.startsWith("file://");
|
|
16
|
+
if (hasNoSourceMaps && !isEsmFile) {
|
|
15
17
|
fileContents = (0, typescript_1.transformCode)(fileContents, { sourceFile: fileName, sourceMaps: true });
|
|
16
18
|
}
|
|
17
19
|
const sourceMapsStartIndex = fileContents.lastIndexOf(constants_1.JS_SOURCE_MAP_URL_COMMENT);
|
|
@@ -23,9 +25,9 @@ const extractSourceMaps = async (fileContents, fileName) => {
|
|
|
23
25
|
? fileContents.slice(sourceMapsStartIndex + constants_1.JS_SOURCE_MAP_URL_COMMENT.length)
|
|
24
26
|
: fileContents.slice(sourceMapsStartIndex + constants_1.JS_SOURCE_MAP_URL_COMMENT.length, sourceMapsEndIndex);
|
|
25
27
|
const sourceMaps = await (0, utils_1.getSourceCodeFile)(url_1.default.resolve(fileName, sourceMapUrl));
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
return
|
|
28
|
+
const rawSourceMaps = JSON.parse(sourceMaps);
|
|
29
|
+
rawSourceMaps.file = rawSourceMaps.file || fileName;
|
|
30
|
+
return new source_map_js_1.SourceMapConsumer(rawSourceMaps);
|
|
29
31
|
};
|
|
30
32
|
exports.extractSourceMaps = extractSourceMaps;
|
|
31
33
|
const resolveLocationWithSourceMap = (stackFrame, sourceMaps) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-maps.js","sourceRoot":"","sources":["../../../src/error-snippets/source-maps.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"source-maps.js","sourceRoot":"","sources":["../../../src/error-snippets/source-maps.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAgE;AAChE,8CAAsB;AACtB,2CAAwD;AACxD,mCAA4C;AAC5C,oCAAgD;AAChD,oDAAoD;AAG7C,MAAM,iBAAiB,GAAG,KAAK,EAAE,YAAoB,EAAE,QAAgB,EAAqC,EAAE;IACjH,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,qCAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAEjD,IAAI,eAAe,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,YAAY,GAAG,IAAA,0BAAa,EAAC,YAAY,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,MAAM,oBAAoB,GAAG,YAAY,CAAC,WAAW,CAAC,qCAAyB,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAE5E,IAAI,oBAAoB,KAAK,CAAC,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,YAAY,GACd,kBAAkB,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,GAAG,qCAAyB,CAAC,MAAM,CAAC;QAC7E,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,GAAG,qCAAyB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAE1G,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAiB,EAAC,aAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAChF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAiB,CAAC;IAE7D,aAAa,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,IAAI,QAAQ,CAAC;IAEpD,OAAO,IAAI,iCAAiB,CAAC,aAAa,CAAC,CAAC;AAChD,CAAC,CAAC;AA1BW,QAAA,iBAAiB,qBA0B5B;AAEK,MAAM,4BAA4B,GAAG,CACxC,UAAgC,EAChC,UAA6B,EAChB,EAAE;IACf,MAAM,SAAS,GAAG,UAAU,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;IACnH,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvF,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,IAAK,EAAE,MAAM,EAAE,SAAS,CAAC,MAAO,EAAE,CAAC;IAEtE,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAA,sBAAiB,EAAC,UAAU,CAAC,IAAc,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AACpF,CAAC,CAAC;AAjBW,QAAA,4BAA4B,gCAiBvC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UnhandledRejectionError = void 0;
|
|
4
|
+
class UnhandledRejectionError extends Error {
|
|
5
|
+
constructor(details) {
|
|
6
|
+
const lines = [];
|
|
7
|
+
lines.push("This run has been terminated due to an unhandled promise rejection.\n");
|
|
8
|
+
lines.push("What happened:");
|
|
9
|
+
lines.push("- A promise rejected without being handled");
|
|
10
|
+
lines.push("What you can do:");
|
|
11
|
+
lines.push('- Analyze error below and check your tests for missing "await" statements');
|
|
12
|
+
lines.push("- Turn on the @typescript-eslint/no-floating-promises rule to catch\n" +
|
|
13
|
+
' missing "await" statements automatically (works even for js files!)');
|
|
14
|
+
if (details.testsHint) {
|
|
15
|
+
lines.push(`\nThe error most likely originated from one of the tests below.\n${details.testsHint}`);
|
|
16
|
+
}
|
|
17
|
+
lines.push(`\nError details: ${details.error.message}\n${details.error.stack}`);
|
|
18
|
+
super(lines[0]);
|
|
19
|
+
this.stack = lines.join("\n");
|
|
20
|
+
this.name = "UnhandledRejectionTerminatedError";
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.UnhandledRejectionError = UnhandledRejectionError;
|
|
24
|
+
//# sourceMappingURL=unhandled-rejection-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unhandled-rejection-error.js","sourceRoot":"","sources":["../../../src/errors/unhandled-rejection-error.ts"],"names":[],"mappings":";;;AAMA,MAAa,uBAAwB,SAAQ,KAAK;IAC9C,YAAY,OAAuC;QAC/C,MAAM,KAAK,GAAkB,EAAE,CAAC;QAChC,KAAK,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;QAEpF,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAEzD,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC;QACxF,KAAK,CAAC,IAAI,CACN,uEAAuE;YACnE,uEAAuE,CAC9E,CAAC;QAEF,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,oEAAoE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QACxG,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAEhF,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAC;IACpD,CAAC;CACJ;AAzBD,0DAyBC"}
|
|
@@ -21,6 +21,7 @@ export declare const RunnerSyncEvents: {
|
|
|
21
21
|
readonly SUITE_BEGIN: "beginSuite";
|
|
22
22
|
readonly SUITE_END: "endSuite";
|
|
23
23
|
readonly TEST_BEGIN: "beginTest";
|
|
24
|
+
readonly TEST_ASSIGNED_TO_WORKER: "testAssignedToWorker";
|
|
24
25
|
readonly TEST_END: "endTest";
|
|
25
26
|
readonly TEST_PASS: "passTest";
|
|
26
27
|
readonly TEST_FAIL: "failTest";
|
|
@@ -59,6 +60,7 @@ export declare const MasterSyncEvents: {
|
|
|
59
60
|
SUITE_BEGIN: "beginSuite";
|
|
60
61
|
SUITE_END: "endSuite";
|
|
61
62
|
TEST_BEGIN: "beginTest";
|
|
63
|
+
TEST_ASSIGNED_TO_WORKER: "testAssignedToWorker";
|
|
62
64
|
TEST_END: "endTest";
|
|
63
65
|
TEST_PASS: "passTest";
|
|
64
66
|
TEST_FAIL: "failTest";
|
|
@@ -84,6 +86,7 @@ export declare const MasterEvents: {
|
|
|
84
86
|
readonly SUITE_BEGIN: "beginSuite";
|
|
85
87
|
readonly SUITE_END: "endSuite";
|
|
86
88
|
readonly TEST_BEGIN: "beginTest";
|
|
89
|
+
readonly TEST_ASSIGNED_TO_WORKER: "testAssignedToWorker";
|
|
87
90
|
readonly TEST_END: "endTest";
|
|
88
91
|
readonly TEST_PASS: "passTest";
|
|
89
92
|
readonly TEST_FAIL: "failTest";
|
|
@@ -129,6 +132,7 @@ export declare const Events: {
|
|
|
129
132
|
readonly SUITE_BEGIN: "beginSuite";
|
|
130
133
|
readonly SUITE_END: "endSuite";
|
|
131
134
|
readonly TEST_BEGIN: "beginTest";
|
|
135
|
+
readonly TEST_ASSIGNED_TO_WORKER: "testAssignedToWorker";
|
|
132
136
|
readonly TEST_END: "endTest";
|
|
133
137
|
readonly TEST_PASS: "passTest";
|
|
134
138
|
readonly TEST_FAIL: "failTest";
|