testplane 8.30.0 → 8.30.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/build/package.json +8 -13
- package/build/src/base-testplane.js +1 -1
- package/build/src/base-testplane.js.map +1 -1
- package/build/src/browser/calibrator.js +1 -5
- package/build/src/browser/calibrator.js.map +1 -1
- package/build/src/browser/commands/assert-view/errors/base-state-error.d.ts +1 -1
- package/build/src/browser/commands/assert-view/errors/image-diff-error.d.ts +1 -1
- package/build/src/browser/commands/assert-view/errors/image-diff-error.js +24 -2
- package/build/src/browser/commands/assert-view/errors/image-diff-error.js.map +1 -1
- package/build/src/browser/commands/moveCursorTo.d.ts +1 -1
- package/build/src/browser/commands/openAndWait.d.ts +2 -2
- package/build/src/browser/commands/openAndWait.js +26 -3
- package/build/src/browser/commands/openAndWait.js.map +1 -1
- package/build/src/browser/commands/runStep.d.ts +1 -1
- package/build/src/browser/commands/switchToRepl.js +1 -2
- package/build/src/browser/commands/switchToRepl.js.map +1 -1
- package/build/src/browser/commands/types.d.ts +2 -2
- package/build/src/browser/existing-browser.js +3 -1
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/callstack.d.ts +1 -0
- package/build/src/browser/history/callstack.js +5 -2
- package/build/src/browser/history/callstack.js.map +1 -1
- package/build/src/browser/new-browser.js +3 -13
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser/screen-shooter/viewport/index.js +2 -3
- package/build/src/browser/screen-shooter/viewport/index.js.map +1 -1
- package/build/src/browser/types.d.ts +5 -5
- package/build/src/browser/types.js +4 -5
- package/build/src/browser/types.js.map +1 -1
- package/build/src/browser-installer/chrome/index.js +6 -1
- package/build/src/browser-installer/chrome/index.js.map +1 -1
- package/build/src/browser-installer/constants.d.ts +1 -0
- package/build/src/browser-installer/constants.js +2 -1
- package/build/src/browser-installer/constants.js.map +1 -1
- package/build/src/browser-installer/edge/index.js +6 -1
- package/build/src/browser-installer/edge/index.js.map +1 -1
- package/build/src/browser-installer/firefox/index.js +6 -1
- package/build/src/browser-installer/firefox/index.js.map +1 -1
- package/build/src/browser-installer/safari/index.js +6 -1
- package/build/src/browser-installer/safari/index.js.map +1 -1
- package/build/src/browser-pool/basic-pool.d.ts +1 -1
- package/build/src/browser-pool/basic-pool.js +25 -2
- package/build/src/browser-pool/basic-pool.js.map +1 -1
- package/build/src/browser-pool/webdriver-pool.js +27 -3
- package/build/src/browser-pool/webdriver-pool.js.map +1 -1
- package/build/src/bundle/cjs/index.js +1244 -75659
- package/build/src/cli/commands/install-deps/index.d.ts +1 -1
- package/build/src/cli/commands/install-deps/index.js +8 -8
- package/build/src/cli/commands/install-deps/index.js.map +1 -1
- package/build/src/config/types.d.ts +1 -1
- package/build/src/constants/png.d.ts +13 -0
- package/build/src/constants/png.js +17 -0
- package/build/src/constants/png.js.map +1 -0
- package/build/src/error-snippets/source-maps.js +7 -1
- package/build/src/error-snippets/source-maps.js.map +1 -1
- package/build/src/image.d.ts +14 -14
- package/build/src/image.js +80 -91
- package/build/src/image.js.map +1 -1
- package/build/src/test-reader/controllers/also-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/also-controller.js.map +1 -1
- package/build/src/test-reader/controllers/browser-version-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/config-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/config-controller.js.map +1 -1
- package/build/src/test-reader/controllers/only-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/skip-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/skip-controller.js.map +1 -1
- package/build/src/test-reader/index.d.ts +3 -3
- package/build/src/test-reader/index.js +1 -4
- package/build/src/test-reader/index.js.map +1 -1
- package/build/src/test-reader/sets-builder/index.d.ts +1 -1
- package/build/src/test-reader/sets-builder/index.js +6 -5
- package/build/src/test-reader/sets-builder/index.js.map +1 -1
- package/build/src/test-reader/sets-builder/set-collection.d.ts +1 -1
- package/build/src/test-reader/sets-builder/test-set.d.ts +2 -2
- package/build/src/test-reader/sets-builder/test-set.js +2 -3
- package/build/src/test-reader/sets-builder/test-set.js.map +1 -1
- package/build/src/test-reader/test-parser.d.ts +1 -4
- package/build/src/test-reader/test-parser.js +5 -10
- package/build/src/test-reader/test-parser.js.map +1 -1
- package/build/src/testplane.d.ts +2 -2
- package/build/src/testplane.js +6 -3
- package/build/src/testplane.js.map +1 -1
- package/build/src/types/index.d.ts +13 -13
- package/build/src/utils/eight-bit-rgba-to-png.d.ts +2 -0
- package/build/src/utils/eight-bit-rgba-to-png.js +61 -0
- package/build/src/utils/eight-bit-rgba-to-png.js.map +1 -0
- package/build/src/utils/preload-utils.d.ts +2 -0
- package/build/src/utils/preload-utils.js +13 -0
- package/build/src/utils/preload-utils.js.map +1 -0
- package/build/src/utils/processor.d.ts +2 -2
- package/build/src/utils/processor.js +12 -2
- package/build/src/utils/processor.js.map +1 -1
- package/build/src/utils/typescript.d.ts +6 -1
- package/build/src/utils/typescript.js +90 -71
- package/build/src/utils/typescript.js.map +1 -1
- package/build/src/utils/workers-registry.js +7 -2
- package/build/src/utils/workers-registry.js.map +1 -1
- package/build/src/worker/browser-env/runner/test-runner/index.d.ts +2 -1
- package/build/src/worker/browser-env/runner/test-runner/index.js +5 -2
- package/build/src/worker/browser-env/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/runner/index.js +32 -7
- package/build/src/worker/runner/index.js.map +1 -1
- package/build/src/worker/runner/simple-test-parser.js +1 -8
- package/build/src/worker/runner/simple-test-parser.js.map +1 -1
- package/build/src/worker/runner/test-runner/index.d.ts +8 -9
- package/build/src/worker/runner/test-runner/index.js +30 -10
- package/build/src/worker/runner/test-runner/index.js.map +1 -1
- package/package.json +8 -13
- package/build/src/bundle/test-transformer.d.ts +0 -4
- package/build/src/bundle/test-transformer.js +0 -9
- package/build/src/bundle/test-transformer.js.map +0 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { Testplane } from "../../../testplane";
|
|
1
|
+
import type { Testplane } from "../../../testplane";
|
|
2
2
|
export declare const registerCmd: (cliTool: typeof commander, testplane: Testplane) => void;
|
|
@@ -26,7 +26,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.registerCmd = void 0;
|
|
27
27
|
const constants_1 = require("../../constants");
|
|
28
28
|
const logger = __importStar(require("../../../utils/logger"));
|
|
29
|
-
const browser_installer_1 = require("../../../browser-installer");
|
|
30
29
|
const { INSTALL_DEPS: commandName } = constants_1.CliCommands;
|
|
31
30
|
const logResult = (browsersInstallPerStatus, logType, status, heading, formatLine) => {
|
|
32
31
|
if (!browsersInstallPerStatus[status].length) {
|
|
@@ -41,6 +40,7 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
41
40
|
.option("-c, --config <path>", "path to configuration file")
|
|
42
41
|
.arguments("[browsers...]")
|
|
43
42
|
.action(async (browsers) => {
|
|
43
|
+
const { installBrowsersWithDrivers, BrowserInstallStatus } = await Promise.resolve().then(() => __importStar(require("../../../browser-installer")));
|
|
44
44
|
try {
|
|
45
45
|
if (!browsers.length) {
|
|
46
46
|
browsers = Object.keys(testplane.config.browsers);
|
|
@@ -62,12 +62,12 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
62
62
|
].join("\n"));
|
|
63
63
|
}
|
|
64
64
|
});
|
|
65
|
-
const browsersInstallResult = await
|
|
65
|
+
const browsersInstallResult = await installBrowsersWithDrivers(browsersToInstall);
|
|
66
66
|
const browserTags = Object.keys(browsersInstallResult);
|
|
67
67
|
const browsersInstallPerStatus = {
|
|
68
|
-
[
|
|
69
|
-
[
|
|
70
|
-
[
|
|
68
|
+
[BrowserInstallStatus.Ok]: [],
|
|
69
|
+
[BrowserInstallStatus.Skip]: [],
|
|
70
|
+
[BrowserInstallStatus.Error]: [],
|
|
71
71
|
};
|
|
72
72
|
for (const tag of browserTags) {
|
|
73
73
|
const result = browsersInstallResult[tag];
|
|
@@ -79,9 +79,9 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
79
79
|
bucket.push({ tag });
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
logResult(browsersInstallPerStatus, "log",
|
|
83
|
-
logResult(browsersInstallPerStatus, "warn",
|
|
84
|
-
logResult(browsersInstallPerStatus, "error",
|
|
82
|
+
logResult(browsersInstallPerStatus, "log", BrowserInstallStatus.Ok, "These browsers are downloaded successfully:", ({ tag }) => `- ${tag}`);
|
|
83
|
+
logResult(browsersInstallPerStatus, "warn", BrowserInstallStatus.Skip, "Browser install for these browsers was skipped:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
84
|
+
logResult(browsersInstallPerStatus, "error", BrowserInstallStatus.Error, "An error occured while trying to download these browsers:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
85
85
|
}
|
|
86
86
|
catch (err) {
|
|
87
87
|
logger.error(err.stack || err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/install-deps/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA8C;AAC9C,8DAAgD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/install-deps/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { BrowserConfig } from "./browser-config";
|
|
|
4
4
|
import type { BrowserTestRunEnvOptions } from "../runner/browser-env/vite/types";
|
|
5
5
|
import type { Test } from "../types";
|
|
6
6
|
import type { ChildProcessWithoutNullStreams } from "child_process";
|
|
7
|
-
import { RequestOptions } from "https";
|
|
7
|
+
import type { RequestOptions } from "https";
|
|
8
8
|
export interface CompareOptsConfig {
|
|
9
9
|
shouldCluster: boolean;
|
|
10
10
|
clustersSize: number;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
export declare const RGBA_CHANNELS = 4;
|
|
3
|
+
export declare const BITS_IN_BYTE = 8;
|
|
4
|
+
export declare const PNG_WIDTH_OFFSET = 16;
|
|
5
|
+
export declare const PNG_HEIGHT_OFFSET = 20;
|
|
6
|
+
export declare const PNG_SIGNATURE: Buffer;
|
|
7
|
+
export declare const PNG_BIT_DEPTH_EIGHT_BIT = 8;
|
|
8
|
+
export declare const PNG_COLOR_TYPE_RGBA = 6;
|
|
9
|
+
export declare const PNG_COMPRESSION_DEFLATE = 0;
|
|
10
|
+
export declare const PNG_FILTER_NO_FILTER = 0;
|
|
11
|
+
export declare const PNG_INTERLACE_NO_INTERLACE = 0;
|
|
12
|
+
export declare const PNG_IHDR_LENGTH = 13;
|
|
13
|
+
export declare const PNG_MIN_ASSIST_BYTES = 57;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PNG_MIN_ASSIST_BYTES = exports.PNG_IHDR_LENGTH = exports.PNG_INTERLACE_NO_INTERLACE = exports.PNG_FILTER_NO_FILTER = exports.PNG_COMPRESSION_DEFLATE = exports.PNG_COLOR_TYPE_RGBA = exports.PNG_BIT_DEPTH_EIGHT_BIT = exports.PNG_SIGNATURE = exports.PNG_HEIGHT_OFFSET = exports.PNG_WIDTH_OFFSET = exports.BITS_IN_BYTE = exports.RGBA_CHANNELS = void 0;
|
|
4
|
+
exports.RGBA_CHANNELS = 4;
|
|
5
|
+
exports.BITS_IN_BYTE = 8;
|
|
6
|
+
// https://en.wikipedia.org/wiki/PNG#Critical_chunks
|
|
7
|
+
exports.PNG_WIDTH_OFFSET = 16;
|
|
8
|
+
exports.PNG_HEIGHT_OFFSET = 20;
|
|
9
|
+
exports.PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
|
|
10
|
+
exports.PNG_BIT_DEPTH_EIGHT_BIT = 8;
|
|
11
|
+
exports.PNG_COLOR_TYPE_RGBA = 6;
|
|
12
|
+
exports.PNG_COMPRESSION_DEFLATE = 0;
|
|
13
|
+
exports.PNG_FILTER_NO_FILTER = 0;
|
|
14
|
+
exports.PNG_INTERLACE_NO_INTERLACE = 0;
|
|
15
|
+
exports.PNG_IHDR_LENGTH = 13;
|
|
16
|
+
exports.PNG_MIN_ASSIST_BYTES = 57;
|
|
17
|
+
//# sourceMappingURL=png.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"png.js","sourceRoot":"","sources":["../../../src/constants/png.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,CAAC,CAAC;AAClB,QAAA,YAAY,GAAG,CAAC,CAAC;AAE9B,oDAAoD;AACvC,QAAA,gBAAgB,GAAG,EAAE,CAAC;AACtB,QAAA,iBAAiB,GAAG,EAAE,CAAC;AAEvB,QAAA,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAC5B,QAAA,mBAAmB,GAAG,CAAC,CAAC;AACxB,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAC5B,QAAA,oBAAoB,GAAG,CAAC,CAAC;AACzB,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAC/B,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,oBAAoB,GAAG,EAAE,CAAC"}
|
|
@@ -9,7 +9,11 @@ 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
|
+
const typescript_1 = require("../utils/typescript");
|
|
12
13
|
const extractSourceMaps = async (fileContents, fileName) => {
|
|
14
|
+
if (fileContents.indexOf(constants_1.SOURCE_MAP_URL_COMMENT) === -1) {
|
|
15
|
+
fileContents = (0, typescript_1.transformCode)(fileContents, { sourceFile: fileName, sourceMaps: true });
|
|
16
|
+
}
|
|
13
17
|
const sourceMapsStartIndex = fileContents.indexOf(constants_1.SOURCE_MAP_URL_COMMENT);
|
|
14
18
|
const sourceMapsEndIndex = fileContents.indexOf("\n", sourceMapsStartIndex);
|
|
15
19
|
if (sourceMapsStartIndex === -1) {
|
|
@@ -19,7 +23,9 @@ const extractSourceMaps = async (fileContents, fileName) => {
|
|
|
19
23
|
? fileContents.slice(sourceMapsStartIndex + constants_1.SOURCE_MAP_URL_COMMENT.length)
|
|
20
24
|
: fileContents.slice(sourceMapsStartIndex + constants_1.SOURCE_MAP_URL_COMMENT.length, sourceMapsEndIndex);
|
|
21
25
|
const sourceMaps = await (0, utils_1.getSourceCodeFile)(url_1.default.resolve(fileName, sourceMapUrl));
|
|
22
|
-
|
|
26
|
+
const consumer = (await new source_map_1.SourceMapConsumer(sourceMaps));
|
|
27
|
+
consumer.file = consumer.file || fileName;
|
|
28
|
+
return consumer;
|
|
23
29
|
};
|
|
24
30
|
exports.extractSourceMaps = extractSourceMaps;
|
|
25
31
|
const resolveLocationWithSourceMap = (stackFrame, sourceMaps) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-maps.js","sourceRoot":"","sources":["../../../src/error-snippets/source-maps.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA4E;AAC5E,8CAAsB;AACtB,2CAAqD;AACrD,mCAA4C;AAC5C,oCAAgD;
|
|
1
|
+
{"version":3,"file":"source-maps.js","sourceRoot":"","sources":["../../../src/error-snippets/source-maps.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA4E;AAC5E,8CAAsB;AACtB,2CAAqD;AACrD,mCAA4C;AAC5C,oCAAgD;AAChD,oDAAoD;AAG7C,MAAM,iBAAiB,GAAG,KAAK,EAClC,YAAoB,EACpB,QAAgB,EACsB,EAAE;IACxC,IAAI,YAAY,CAAC,OAAO,CAAC,kCAAsB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACtD,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,OAAO,CAAC,kCAAsB,CAAC,CAAC;IAC1E,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,kCAAsB,CAAC,MAAM,CAAC;QAC1E,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,GAAG,kCAAsB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAEvG,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAiB,EAAC,aAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,8BAAiB,CAAC,UAAU,CAAC,CAA2B,CAAC;IAErF,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC;IAE1C,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AA1BW,QAAA,iBAAiB,qBA0B5B;AAEK,MAAM,4BAA4B,GAAG,CACxC,UAAgC,EAChC,UAAkC,EACrB,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,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC1E,CAAC,CAAC;AAjBW,QAAA,4BAA4B,gCAiBvC"}
|
package/build/src/image.d.ts
CHANGED
|
@@ -11,11 +11,10 @@ export interface Rect {
|
|
|
11
11
|
top: number;
|
|
12
12
|
left: number;
|
|
13
13
|
}
|
|
14
|
-
export interface
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
a: number;
|
|
14
|
+
export interface RGB {
|
|
15
|
+
R: number;
|
|
16
|
+
G: number;
|
|
17
|
+
B: number;
|
|
19
18
|
}
|
|
20
19
|
interface CompareOptions {
|
|
21
20
|
canHaveCaret?: boolean;
|
|
@@ -25,21 +24,22 @@ interface CompareOptions {
|
|
|
25
24
|
antialiasingTolerance?: number;
|
|
26
25
|
}
|
|
27
26
|
export declare class Image {
|
|
28
|
-
private
|
|
29
|
-
private
|
|
30
|
-
private
|
|
27
|
+
private _imgDataPromise;
|
|
28
|
+
private _imgData;
|
|
29
|
+
private _width;
|
|
30
|
+
private _height;
|
|
31
31
|
private _composeImages;
|
|
32
32
|
static create(buffer: Buffer): Image;
|
|
33
33
|
constructor(buffer: Buffer);
|
|
34
|
+
_getImgData(): Promise<Buffer>;
|
|
35
|
+
_ensureImagesHaveSameWidth(): void;
|
|
34
36
|
getSize(): Promise<ImageSize>;
|
|
35
37
|
crop(rect: Rect): Promise<void>;
|
|
36
|
-
addJoin(attachedImages:
|
|
38
|
+
addJoin(attachedImages: this[]): void;
|
|
37
39
|
applyJoin(): Promise<void>;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
private _forceRefreshImageData;
|
|
42
|
-
getRGBA(x: number, y: number): Promise<RGBA>;
|
|
40
|
+
clearArea(rect: Rect): Promise<void>;
|
|
41
|
+
getRGB(x: number, y: number): Promise<RGB>;
|
|
42
|
+
_getPngBuffer(): Promise<Buffer>;
|
|
43
43
|
save(file: string): Promise<void>;
|
|
44
44
|
static fromBase64(base64: string): Image;
|
|
45
45
|
toPngBuffer(opts: {
|
package/build/src/image.js
CHANGED
|
@@ -4,37 +4,68 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Image = void 0;
|
|
7
|
-
const
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const looks_same_1 = __importDefault(require("looks-same"));
|
|
9
|
+
const load_esm_1 = require("load-esm");
|
|
10
|
+
const eight_bit_rgba_to_png_1 = require("./utils/eight-bit-rgba-to-png");
|
|
11
|
+
const png_1 = require("./constants/png");
|
|
12
|
+
const initJsquashPromise = new Promise(resolve => {
|
|
13
|
+
const wasmLocation = require.resolve("@jsquash/png/codec/pkg/squoosh_png_bg.wasm");
|
|
14
|
+
Promise.all([(0, load_esm_1.loadEsm)("@jsquash/png/decode.js"), fs_1.default.promises.readFile(wasmLocation)])
|
|
15
|
+
.then(([mod, wasmBytes]) => mod.init(wasmBytes))
|
|
16
|
+
.then(resolve);
|
|
17
|
+
});
|
|
18
|
+
const jsquashDecode = (buffer) => {
|
|
19
|
+
return Promise.all([(0, load_esm_1.loadEsm)("@jsquash/png/decode.js"), initJsquashPromise]).then(([mod]) => mod.decode(buffer, { bitDepth: png_1.BITS_IN_BYTE }));
|
|
20
|
+
};
|
|
9
21
|
class Image {
|
|
10
22
|
static create(buffer) {
|
|
11
23
|
return new this(buffer);
|
|
12
24
|
}
|
|
13
25
|
constructor(buffer) {
|
|
14
|
-
this.
|
|
15
|
-
this._ignoreData = [];
|
|
16
|
-
// eslint-disable-next-line no-use-before-define
|
|
26
|
+
this._imgData = null;
|
|
17
27
|
this._composeImages = [];
|
|
18
|
-
this.
|
|
28
|
+
this._width = buffer.readUInt32BE(png_1.PNG_WIDTH_OFFSET);
|
|
29
|
+
this._height = buffer.readUInt32BE(png_1.PNG_HEIGHT_OFFSET);
|
|
30
|
+
this._imgDataPromise = jsquashDecode(buffer).then(({ data }) => {
|
|
31
|
+
return Buffer.from(data.buffer, data.byteOffset, data.byteLength);
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
async _getImgData() {
|
|
35
|
+
if (this._imgData) {
|
|
36
|
+
return this._imgData;
|
|
37
|
+
}
|
|
38
|
+
return (this._imgData = await this._imgDataPromise);
|
|
39
|
+
}
|
|
40
|
+
_ensureImagesHaveSameWidth() {
|
|
41
|
+
for (const image of this._composeImages) {
|
|
42
|
+
if (image._width !== this._width) {
|
|
43
|
+
throw new Error([
|
|
44
|
+
`It looks like viewport width changed while performing long page screenshot (${this._width}px -> ${image._width}px)`,
|
|
45
|
+
"Please make sure page is fully loaded before making screenshot",
|
|
46
|
+
].join("\n"));
|
|
47
|
+
}
|
|
48
|
+
}
|
|
19
49
|
}
|
|
20
50
|
async getSize() {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
width: Math.max(totalSize.width, img.width),
|
|
25
|
-
height: totalSize.height + img.height,
|
|
26
|
-
};
|
|
27
|
-
}, { width: 0, height: 0 });
|
|
51
|
+
this._ensureImagesHaveSameWidth();
|
|
52
|
+
const height = this._composeImages.reduce((acc, img) => acc + img._height, this._height);
|
|
53
|
+
return { height, width: this._width };
|
|
28
54
|
}
|
|
29
55
|
async crop(rect) {
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
56
|
+
const imgData = await this._getImgData();
|
|
57
|
+
let bufferPointer = 0;
|
|
58
|
+
let sourceOffset = (rect.top * this._width + rect.left) * png_1.RGBA_CHANNELS;
|
|
59
|
+
const bytesToCopy = Math.min(rect.width, this._width - rect.left) * png_1.RGBA_CHANNELS;
|
|
60
|
+
const bytesToIterate = this._width * png_1.RGBA_CHANNELS;
|
|
61
|
+
for (let i = 0; i < Math.min(rect.height, this._height - rect.top); i++) {
|
|
62
|
+
imgData.copy(imgData, bufferPointer, sourceOffset, sourceOffset + bytesToCopy);
|
|
63
|
+
bufferPointer += bytesToCopy;
|
|
64
|
+
sourceOffset += bytesToIterate;
|
|
65
|
+
}
|
|
66
|
+
this._imgData = Buffer.from(imgData.buffer, 0, bufferPointer);
|
|
67
|
+
this._width = rect.width;
|
|
68
|
+
this._height = rect.height;
|
|
38
69
|
}
|
|
39
70
|
addJoin(attachedImages) {
|
|
40
71
|
this._composeImages = this._composeImages.concat(attachedImages);
|
|
@@ -42,89 +73,47 @@ class Image {
|
|
|
42
73
|
async applyJoin() {
|
|
43
74
|
if (!this._composeImages.length)
|
|
44
75
|
return;
|
|
45
|
-
|
|
46
|
-
const
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
input: data,
|
|
52
|
-
left: 0,
|
|
53
|
-
top: newHeight,
|
|
54
|
-
raw: {
|
|
55
|
-
width: info.width,
|
|
56
|
-
height: info.height,
|
|
57
|
-
channels: info.channels,
|
|
58
|
-
},
|
|
59
|
-
});
|
|
60
|
-
newHeight += info.height;
|
|
61
|
-
}
|
|
62
|
-
this._img.resize({
|
|
63
|
-
width,
|
|
64
|
-
height: newHeight,
|
|
65
|
-
fit: "contain",
|
|
66
|
-
position: "top",
|
|
67
|
-
});
|
|
68
|
-
this._img.composite(compositeData);
|
|
69
|
-
}
|
|
70
|
-
async addClear({ width, height, left, top }) {
|
|
71
|
-
const { channels } = await this._img.metadata();
|
|
72
|
-
this._ignoreData.push({
|
|
73
|
-
input: {
|
|
74
|
-
create: {
|
|
75
|
-
channels: channels,
|
|
76
|
-
background: { r: 0, g: 0, b: 0, alpha: 1 },
|
|
77
|
-
width,
|
|
78
|
-
height,
|
|
79
|
-
},
|
|
80
|
-
},
|
|
81
|
-
left,
|
|
82
|
-
top,
|
|
83
|
-
});
|
|
84
|
-
}
|
|
85
|
-
applyClear() {
|
|
86
|
-
this._img.composite(this._ignoreData);
|
|
76
|
+
this._ensureImagesHaveSameWidth();
|
|
77
|
+
const resultHeight = this._composeImages.reduce((acc, img) => acc + img._height, this._height);
|
|
78
|
+
const imageBuffers = await Promise.all([this, ...this._composeImages].map(img => img._getImgData()));
|
|
79
|
+
this._imgData = Buffer.concat(imageBuffers);
|
|
80
|
+
this._height = resultHeight;
|
|
81
|
+
this._composeImages = [];
|
|
87
82
|
}
|
|
88
|
-
async
|
|
89
|
-
|
|
90
|
-
|
|
83
|
+
async clearArea(rect) {
|
|
84
|
+
const imgData = await this._getImgData();
|
|
85
|
+
let sourceOffset = (rect.top * this._width + rect.left) * png_1.RGBA_CHANNELS;
|
|
86
|
+
const bytesToCopyAmount = Math.min(rect.width, this._width - rect.left) * png_1.RGBA_CHANNELS;
|
|
87
|
+
const bytesToIterate = this._width * png_1.RGBA_CHANNELS;
|
|
88
|
+
const bytesToFill = Buffer.from([0, 0, 0, 255]); // black RGBA
|
|
89
|
+
for (let i = 0; i < Math.min(rect.height, this._height - rect.top); i++) {
|
|
90
|
+
imgData.fill(bytesToFill, sourceOffset, sourceOffset + bytesToCopyAmount);
|
|
91
|
+
sourceOffset += bytesToIterate;
|
|
91
92
|
}
|
|
92
|
-
return this._imageData;
|
|
93
|
-
}
|
|
94
|
-
async _forceRefreshImageData() {
|
|
95
|
-
this._imageData = await this._img.raw().toBuffer({ resolveWithObject: true });
|
|
96
|
-
this._img = (0, sharp_1.default)(this._imageData.data, {
|
|
97
|
-
raw: {
|
|
98
|
-
width: this._imageData.info.width,
|
|
99
|
-
height: this._imageData.info.height,
|
|
100
|
-
channels: this._imageData.info.channels,
|
|
101
|
-
},
|
|
102
|
-
});
|
|
103
|
-
this._composeImages = [];
|
|
104
|
-
this._ignoreData = [];
|
|
105
93
|
}
|
|
106
|
-
async
|
|
107
|
-
const
|
|
108
|
-
const idx = (
|
|
94
|
+
async getRGB(x, y) {
|
|
95
|
+
const imgData = await this._getImgData();
|
|
96
|
+
const idx = (this._width * y + x) * png_1.RGBA_CHANNELS;
|
|
109
97
|
return {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
a: info.channels === 4 ? data[idx + 3] : 1,
|
|
98
|
+
R: imgData[idx],
|
|
99
|
+
G: imgData[idx + 1],
|
|
100
|
+
B: imgData[idx + 2],
|
|
114
101
|
};
|
|
115
102
|
}
|
|
103
|
+
async _getPngBuffer() {
|
|
104
|
+
const imageData = await this._getImgData();
|
|
105
|
+
return (0, eight_bit_rgba_to_png_1.convertRgbaToPng)(imageData, this._width, this._height);
|
|
106
|
+
}
|
|
116
107
|
async save(file) {
|
|
117
|
-
await this.
|
|
108
|
+
const data = await this._getPngBuffer();
|
|
109
|
+
await fs_1.default.promises.writeFile(file, data);
|
|
118
110
|
}
|
|
119
111
|
static fromBase64(base64) {
|
|
120
112
|
return new this(Buffer.from(base64, "base64"));
|
|
121
113
|
}
|
|
122
114
|
async toPngBuffer(opts = { resolveWithObject: true }) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
return { data: imgData.data, size: { height: imgData.info.height, width: imgData.info.width } };
|
|
126
|
-
}
|
|
127
|
-
return await this._img.png().toBuffer({ resolveWithObject: false });
|
|
115
|
+
const data = await this._getPngBuffer();
|
|
116
|
+
return opts.resolveWithObject ? { data, size: { width: this._width, height: this._height } } : data;
|
|
128
117
|
}
|
|
129
118
|
static compare(path1, path2, opts = {}) {
|
|
130
119
|
const compareOptions = {
|
package/build/src/image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/image.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/image.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { EventEmitter } from "events";
|
|
2
|
+
import type { EventEmitter } from "events";
|
|
3
3
|
export declare class AlsoController {
|
|
4
4
|
#private;
|
|
5
5
|
static create<T extends AlsoController>(this: new (eventBus: EventEmitter) => T, eventBus: EventEmitter): T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"also-controller.js","sourceRoot":"","sources":["../../../../src/test-reader/controllers/also-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"also-controller.js","sourceRoot":"","sources":["../../../../src/test-reader/controllers/also-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA8D;AAQ9D,MAAa,cAAc;IAGvB,MAAM,CAAC,MAAM,CAAoE,QAAsB;QACnG,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,YAAY,QAAsB;;QANlC,2CAAwB;QAOpB,uBAAA,IAAI,4BAAa,QAAQ,MAAA,CAAC;IAC9B,CAAC;IAED,EAAE,CAAC,QAAkD;QACjD,uBAAA,IAAI,0DAAS,MAAb,IAAI,EAAU,SAAS,CAAC,EAAE,CAAC,uBAAA,IAAI,wDAAO,MAAX,IAAI,EAAQ,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC;IAChB,CAAC;CAiBJ;AAhCD,wCAgCC;gJAfY,KAAqC;IAC1C,uBAAA,IAAI,gCAAU,CAAC,IAAI,CAAC,yBAAU,CAAC,qBAAqB,EAAE,CAAC,EAAE,WAAW,EAAgC,EAAE,EAAE;QACpG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACvB,GAAG,CAAC,MAAM,EAAE,CAAC;YACjB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,yDAEM,SAAiB,EAAE,QAAkD;IACxE,OAAQ,EAA6B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC5D,OAAO,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;IACrE,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { EventEmitter } from "events";
|
|
2
|
+
import type { EventEmitter } from "events";
|
|
3
3
|
export declare class BrowserVersionController {
|
|
4
4
|
#private;
|
|
5
5
|
static create<T extends BrowserVersionController>(this: new (browserId: string, eventBug: EventEmitter) => T, browserId: string, eventBug: EventEmitter): T;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { EventEmitter } from "events";
|
|
2
|
+
import type { EventEmitter } from "events";
|
|
3
3
|
export declare class ConfigController {
|
|
4
4
|
#private;
|
|
5
5
|
static create<T extends ConfigController>(this: new (eventBus: EventEmitter) => T, eventBus: EventEmitter): T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-controller.js","sourceRoot":"","sources":["../../../../src/test-reader/controllers/config-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,yCAA8D;
|
|
1
|
+
{"version":3,"file":"config-controller.js","sourceRoot":"","sources":["../../../../src/test-reader/controllers/config-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,yCAA8D;AAC9D,iFAAwD;AAOxD,MAAa,gBAAgB;IAGzB,MAAM,CAAC,MAAM,CAAsE,QAAsB;QACrG,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,YAAY,QAAsB;QANlC,6CAAwB;QAOpB,uBAAA,IAAI,8BAAa,QAAQ,MAAA,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,OAAe;QACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,wBAAa,CAAC,WAAW,EAAE,CAAC;QAEjD,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,uBAAA,IAAI,kCAAU,CAAC,IAAI,CAAC,yBAAU,CAAC,qBAAqB,EAAE,CAAC,EAAE,WAAW,EAAgC,EAAE,EAAE;YACpG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAxBD,4CAwBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { EventEmitter } from "events";
|
|
2
|
+
import type { EventEmitter } from "events";
|
|
3
3
|
export declare class OnlyController {
|
|
4
4
|
#private;
|
|
5
5
|
static create<T extends OnlyController>(this: new (eventBus: EventEmitter) => T, eventBus: EventEmitter): T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skip-controller.js","sourceRoot":"","sources":["../../../../src/test-reader/controllers/skip-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"skip-controller.js","sourceRoot":"","sources":["../../../../src/test-reader/controllers/skip-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA8D;AAa9D,MAAa,cAAc;IAGvB,MAAM,CAAC,MAAM,CAAoE,QAAsB;QACnG,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,YAAY,QAAsB;;QANlC,2CAAwB;QAOpB,uBAAA,IAAI,4BAAa,QAAQ,MAAA,CAAC;IAC9B,CAAC;IAED,EAAE,CAAC,QAAkD,EAAE,MAAc,EAAE,EAAE,MAAM,KAAe,EAAE;QAC5F,uBAAA,IAAI,0DAAS,MAAb,IAAI,EAAU,SAAS,CAAC,EAAE,CAAC,uBAAA,IAAI,wDAAO,MAAX,IAAI,EAAQ,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEjF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAkD,EAAE,MAAc,EAAE,EAAE,MAAM,KAAe,EAAE;QAC/F,uBAAA,IAAI,0DAAS,MAAb,IAAI,EAAU,SAAS,CAAC,EAAE,CAAC,CAAC,uBAAA,IAAI,wDAAO,MAAX,IAAI,EAAQ,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAElF,OAAO,IAAI,CAAC;IAChB,CAAC;CAuBJ;AA5CD,wCA4CC;gJArBY,KAAqC,EAAE,MAAc,EAAE,EAAE,MAAM,KAAe,EAAE;IACrF,uBAAA,IAAI,gCAAU,CAAC,IAAI,CAAC,yBAAU,CAAC,qBAAqB,EAAE,CAAC,EAAE,WAAW,EAAgC,EAAE,EAAE;QACpG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,GAAG,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzC,OAAO;YACX,CAAC;YAED,IAAI,MAAM,EAAE,CAAC;gBACT,GAAG,CAAC,OAAO,EAAE,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACJ,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACzB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,yDAEM,QAAkD,EAAE,SAAiB;IACxE,OAAQ,EAA6B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC5D,OAAO,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;IACrE,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { EventEmitter } from "events";
|
|
3
|
-
import { Config } from "../config";
|
|
4
|
-
import { Test } from "./test-object";
|
|
5
|
-
import { ReadTestsOpts } from "../testplane";
|
|
3
|
+
import type { Config } from "../config";
|
|
4
|
+
import type { Test } from "./test-object";
|
|
5
|
+
import type { ReadTestsOpts } from "../testplane";
|
|
6
6
|
export type TestReaderOpts = {
|
|
7
7
|
paths: string[];
|
|
8
8
|
} & Partial<ReadTestsOpts>;
|
|
@@ -41,10 +41,7 @@ class TestReader extends events_1.EventEmitter {
|
|
|
41
41
|
.useSets((sets || []).concat(envSets))
|
|
42
42
|
.useBrowsers(browsers)
|
|
43
43
|
.build(process.cwd(), { ignore }, fileExtensions);
|
|
44
|
-
const
|
|
45
|
-
? __classPrivateFieldGet(this, _TestReader_config, "f").system.testRunEnv[0]
|
|
46
|
-
: __classPrivateFieldGet(this, _TestReader_config, "f").system.testRunEnv;
|
|
47
|
-
const parser = new test_parser_1.TestParser({ testRunEnv });
|
|
44
|
+
const parser = new test_parser_1.TestParser();
|
|
48
45
|
(0, utils_1.passthroughEvent)(parser, this, [events_2.MasterEvents.BEFORE_FILE_READ, events_2.MasterEvents.AFTER_FILE_READ]);
|
|
49
46
|
await parser.loadFiles(setCollection.getAllFiles(), { config: __classPrivateFieldGet(this, _TestReader_config, "f"), runnableOpts });
|
|
50
47
|
const filesByBro = setCollection.groupByBrowser();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test-reader/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,mCAAsC;AACtC,2CAAmD;AACnD,iDAA6C;AAC7C,+CAA2C;AAC3C,sCAAyC;AACzC,uDAA+B;AAO/B,MAAa,UAAW,SAAQ,qBAAY;IAGxC,MAAM,CAAC,MAAM,CAGT,GAAG,IAA8C;QAEjD,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,MAAc;QACtB,KAAK,EAAE,CAAC;QAXZ,qCAAQ;QAaJ,uBAAA,IAAI,sBAAW,MAAM,MAAA,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAuB;QAC9B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAEtE,MAAM,EAAE,cAAc,EAAE,GAAG,uBAAA,IAAI,0BAAQ,CAAC,MAAM,CAAC;QAC/C,MAAM,OAAO,GAAG,aAAG,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC;QACxF,MAAM,aAAa,GAAG,MAAM,0BAAW,CAAC,MAAM,CAAC,uBAAA,IAAI,0BAAQ,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC;aACzG,QAAQ,CAAC,KAAK,CAAC;aACf,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACrC,WAAW,CAAC,QAAS,CAAC;aACtB,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,CAAC;QAEtD,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test-reader/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,mCAAsC;AACtC,2CAAmD;AACnD,iDAA6C;AAC7C,+CAA2C;AAC3C,sCAAyC;AACzC,uDAA+B;AAO/B,MAAa,UAAW,SAAQ,qBAAY;IAGxC,MAAM,CAAC,MAAM,CAGT,GAAG,IAA8C;QAEjD,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,MAAc;QACtB,KAAK,EAAE,CAAC;QAXZ,qCAAQ;QAaJ,uBAAA,IAAI,sBAAW,MAAM,MAAA,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAuB;QAC9B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAEtE,MAAM,EAAE,cAAc,EAAE,GAAG,uBAAA,IAAI,0BAAQ,CAAC,MAAM,CAAC;QAC/C,MAAM,OAAO,GAAG,aAAG,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC;QACxF,MAAM,aAAa,GAAG,MAAM,0BAAW,CAAC,MAAM,CAAC,uBAAA,IAAI,0BAAQ,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC;aACzG,QAAQ,CAAC,KAAK,CAAC;aACf,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACrC,WAAW,CAAC,QAAS,CAAC;aACtB,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,CAAC;QAEtD,MAAM,MAAM,GAAG,IAAI,wBAAU,EAAE,CAAC;QAChC,IAAA,wBAAgB,EAAC,MAAM,EAAE,IAAI,EAAE,CAAC,qBAAY,CAAC,gBAAgB,EAAE,qBAAY,CAAC,eAAe,CAAC,CAAC,CAAC;QAE9F,MAAM,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,uBAAA,IAAI,0BAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QAE5F,MAAM,UAAU,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;QAClD,MAAM,UAAU,GAAG,gBAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAC5D,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAA,IAAI,0BAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CACvF,CAAC;QAEF,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEnC,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AA1CD,gCA0CC;;AAED,SAAS,aAAa,CAAC,UAAkC,EAAE,OAAuB;IAC9E,MAAM,KAAK,GAAG,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAEnD,IAAI,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,aAAa,GAAG,gBAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAErE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACX,kEAAkE,UAAU,CAAC,MAAM,QAAQ;gBACvF,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBAC3F,mGAAmG,CAC1G,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5D,OAAO;IACX,CAAC;IAED,MAAM,eAAe,GAAG,cAAc,CAAC,gBAAC,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IACpE,IAAI,gBAAC,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,6CAA6C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7G,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,uDAAuD,eAAe,EAAE,CAAC,CAAC;IAC9F,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,GAA4B;IAChD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,GAAG,IAAI,gBAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,YAAY,MAAM,EAAE,CAAC;YACrD,IAAI,gBAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,GAAG,KAAM,GAAG,CAAC,GAAG,CAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACjE,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,KAAK,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;YACxC,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -39,9 +39,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
39
39
|
var _SetsBuilder_instances, _SetsBuilder_sets, _SetsBuilder_filesToUse, _SetsBuilder_validateUnknownSets, _SetsBuilder_transformDirsToMasks, _SetsBuilder_getSets, _SetsBuilder_resolvePaths, _SetsBuilder_validateFoundFiles, _SetsBuilder_useFiles, _SetsBuilder_expandFiles, _SetsBuilder_hasFiles;
|
|
40
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
41
41
|
exports.SetsBuilder = void 0;
|
|
42
|
-
const path_1 = __importDefault(require("path"));
|
|
43
42
|
const lodash_1 = __importDefault(require("lodash"));
|
|
44
|
-
const
|
|
43
|
+
const path_1 = __importDefault(require("path"));
|
|
45
44
|
const set_collection_1 = require("./set-collection");
|
|
46
45
|
const test_set_1 = require("./test-set");
|
|
47
46
|
const FILE_EXTENSIONS = [".js", ".mjs"];
|
|
@@ -80,9 +79,11 @@ class SetsBuilder {
|
|
|
80
79
|
.concat(globOpts.ignore)
|
|
81
80
|
.map(ignorePattern => path_1.default.resolve(projectRoot, ignorePattern));
|
|
82
81
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
82
|
+
const resolvePathsPromise = __classPrivateFieldGet(this, _SetsBuilder_instances, "m", _SetsBuilder_transformDirsToMasks).call(this).then(() => __classPrivateFieldGet(this, _SetsBuilder_instances, "m", _SetsBuilder_resolvePaths).call(this, projectRoot));
|
|
83
|
+
const globExtraPromise = Promise.resolve().then(() => __importStar(require("../../bundle/glob-extra")));
|
|
84
|
+
return resolvePathsPromise
|
|
85
|
+
.then(() => globExtraPromise)
|
|
86
|
+
.then(globExtra => globExtra.expandPaths(__classPrivateFieldGet(this, _SetsBuilder_filesToUse, "f"), expandOpts, globOpts))
|
|
86
87
|
.then(expandedFiles => {
|
|
87
88
|
__classPrivateFieldGet(this, _SetsBuilder_instances, "m", _SetsBuilder_validateFoundFiles).call(this, expandedFiles);
|
|
88
89
|
__classPrivateFieldGet(this, _SetsBuilder_instances, "m", _SetsBuilder_useFiles).call(this, expandedFiles);
|