creevey 0.10.0-beta.8 → 0.10.0-rc.0
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/AUTHORS +2 -0
- package/CHANGELOG.md +281 -0
- package/README.md +19 -41
- package/dist/client/addon/components/Addon.js +18 -8
- package/dist/client/addon/components/Addon.js.map +1 -1
- package/dist/client/addon/components/Panel.js +4 -4
- package/dist/client/addon/components/Panel.js.map +1 -1
- package/dist/client/addon/components/TestSelect.js +2 -2
- package/dist/client/addon/components/TestSelect.js.map +1 -1
- package/dist/client/addon/components/Tools.js +19 -9
- package/dist/client/addon/components/Tools.js.map +1 -1
- package/dist/client/addon/controller.d.ts +1 -1
- package/dist/client/addon/controller.js +3 -3
- package/dist/client/addon/controller.js.map +1 -1
- package/dist/client/addon/decorator.d.ts +1 -1
- package/dist/client/addon/makeDecorator.d.ts +9 -0
- package/dist/client/addon/makeDecorator.js +48 -0
- package/dist/client/addon/makeDecorator.js.map +1 -0
- package/dist/client/addon/manager.js +38 -39
- package/dist/client/addon/manager.js.map +1 -1
- package/dist/client/addon/preset.d.ts +0 -1
- package/dist/client/addon/preset.js +3 -2
- package/dist/client/addon/preset.js.map +1 -1
- package/dist/client/addon/preview.d.ts +1 -1
- package/dist/client/addon/withCreevey.d.ts +5 -3
- package/dist/client/addon/withCreevey.js +14 -21
- package/dist/client/addon/withCreevey.js.map +1 -1
- package/dist/client/shared/components/ImagesView/BlendView.d.ts +2 -2
- package/dist/client/shared/components/ImagesView/BlendView.js +18 -8
- package/dist/client/shared/components/ImagesView/BlendView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/ImagesView.js +1 -1
- package/dist/client/shared/components/ImagesView/ImagesView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/SideBySideView.d.ts +2 -2
- package/dist/client/shared/components/ImagesView/SideBySideView.js +19 -9
- package/dist/client/shared/components/ImagesView/SideBySideView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/SlideView.d.ts +2 -2
- package/dist/client/shared/components/ImagesView/SlideView.js +19 -9
- package/dist/client/shared/components/ImagesView/SlideView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/SwapView.d.ts +2 -2
- package/dist/client/shared/components/ImagesView/SwapView.js +31 -9
- package/dist/client/shared/components/ImagesView/SwapView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/common.d.ts +1 -1
- package/dist/client/shared/components/PageFooter/PageFooter.js +1 -1
- package/dist/client/shared/components/PageFooter/PageFooter.js.map +1 -1
- package/dist/client/shared/components/PageFooter/Paging.js +1 -1
- package/dist/client/shared/components/PageFooter/Paging.js.map +1 -1
- package/dist/client/shared/components/PageHeader/ImagePreview.d.ts +2 -2
- package/dist/client/shared/components/PageHeader/ImagePreview.js +2 -1
- package/dist/client/shared/components/PageHeader/ImagePreview.js.map +1 -1
- package/dist/client/shared/components/PageHeader/PageHeader.js +34 -13
- package/dist/client/shared/components/PageHeader/PageHeader.js.map +1 -1
- package/dist/client/shared/components/ResultsPage.d.ts +2 -2
- package/dist/client/shared/components/ResultsPage.js +45 -15
- package/dist/client/shared/components/ResultsPage.js.map +1 -1
- package/dist/client/shared/creeveyClientApi.js +18 -1
- package/dist/client/shared/creeveyClientApi.js.map +1 -1
- package/dist/client/shared/helpers.d.ts +1 -3
- package/dist/client/shared/helpers.js +4 -19
- package/dist/client/shared/helpers.js.map +1 -1
- package/dist/client/web/CreeveyApp.d.ts +1 -0
- package/dist/client/web/CreeveyApp.js +44 -15
- package/dist/client/web/CreeveyApp.js.map +1 -1
- package/dist/client/web/CreeveyContext.d.ts +6 -0
- package/dist/client/web/CreeveyContext.js +21 -7
- package/dist/client/web/CreeveyContext.js.map +1 -1
- package/dist/client/web/CreeveyLoader.d.ts +1 -1
- package/dist/client/web/CreeveyLoader.js +3 -3
- package/dist/client/web/CreeveyLoader.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/Checkbox.d.ts +4 -4
- package/dist/client/web/CreeveyView/SideBar/Checkbox.js +36 -6
- package/dist/client/web/CreeveyView/SideBar/Checkbox.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/Search.js +20 -10
- package/dist/client/web/CreeveyView/SideBar/Search.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBar.js +26 -12
- package/dist/client/web/CreeveyView/SideBar/SideBar.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js +67 -13
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js +32 -12
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.d.ts +6 -6
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js +20 -13
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestLink.js +20 -13
- package/dist/client/web/CreeveyView/SideBar/TestLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestStatusIcon.d.ts +2 -2
- package/dist/client/web/CreeveyView/SideBar/TestStatusIcon.js +2 -2
- package/dist/client/web/CreeveyView/SideBar/TestStatusIcon.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.d.ts +2 -2
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.js +3 -2
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/Toggle.js +1 -1
- package/dist/client/web/CreeveyView/SideBar/Toggle.js.map +1 -1
- package/dist/client/web/KeyboardEventsContext.d.ts +1 -8
- package/dist/client/web/KeyboardEventsContext.js +79 -64
- package/dist/client/web/KeyboardEventsContext.js.map +1 -1
- package/dist/client/web/assets/index-CtSq3IhG.js +518 -0
- package/dist/client/web/index.html +1 -1
- package/dist/client/web/index.js +26 -11
- package/dist/client/web/index.js.map +1 -1
- package/dist/client/web/themes.d.ts +2 -0
- package/dist/client/web/themes.js +22 -0
- package/dist/client/web/themes.js.map +1 -0
- package/dist/creevey.d.ts +1 -1
- package/dist/creevey.js +122 -41
- package/dist/creevey.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/playwright/generator.d.ts +25 -0
- package/dist/playwright/generator.js +243 -0
- package/dist/playwright/generator.js.map +1 -0
- package/dist/playwright/helpers.d.ts +2 -0
- package/dist/playwright/helpers.js +29 -0
- package/dist/playwright/helpers.js.map +1 -0
- package/dist/playwright/reporter.d.ts +83 -0
- package/dist/playwright/reporter.js +334 -0
- package/dist/playwright/reporter.js.map +1 -0
- package/dist/playwright/setup.d.ts +3 -0
- package/dist/playwright/setup.js +72 -0
- package/dist/playwright/setup.js.map +1 -0
- package/dist/playwright.d.ts +1 -0
- package/dist/playwright.js +3 -1
- package/dist/playwright.js.map +1 -1
- package/dist/server/compare.d.ts +18 -0
- package/dist/server/compare.js +182 -0
- package/dist/server/compare.js.map +1 -0
- package/dist/server/config.d.ts +3 -3
- package/dist/server/config.js +75 -8
- package/dist/server/config.js.map +1 -1
- package/dist/server/connection.d.ts +3 -0
- package/dist/server/connection.js +28 -0
- package/dist/server/connection.js.map +1 -0
- package/dist/server/docker.d.ts +1 -1
- package/dist/server/docker.js +54 -32
- package/dist/server/docker.js.map +1 -1
- package/dist/server/index.d.ts +2 -2
- package/dist/server/index.js +165 -64
- package/dist/server/index.js.map +1 -1
- package/dist/server/master/api.d.ts +11 -6
- package/dist/server/master/api.js +88 -25
- package/dist/server/master/api.js.map +1 -1
- package/dist/server/master/handlers/capture-handler.d.ts +5 -0
- package/dist/server/master/handlers/capture-handler.js +25 -0
- package/dist/server/master/handlers/capture-handler.js.map +1 -0
- package/dist/server/master/handlers/index.d.ts +4 -0
- package/dist/server/master/handlers/index.js +21 -0
- package/dist/server/master/handlers/index.js.map +1 -0
- package/dist/server/master/handlers/ping-handler.d.ts +2 -0
- package/dist/server/master/handlers/ping-handler.js +8 -0
- package/dist/server/master/handlers/ping-handler.js.map +1 -0
- package/dist/server/master/handlers/static-handler.d.ts +1 -0
- package/dist/server/master/handlers/static-handler.js +20 -0
- package/dist/server/master/handlers/static-handler.js.map +1 -0
- package/dist/server/master/handlers/stories-handler.d.ts +4 -0
- package/dist/server/master/handlers/stories-handler.js +24 -0
- package/dist/server/master/handlers/stories-handler.js.map +1 -0
- package/dist/server/master/master.js +7 -24
- package/dist/server/master/master.js.map +1 -1
- package/dist/server/master/pool.d.ts +1 -0
- package/dist/server/master/pool.js +5 -3
- package/dist/server/master/pool.js.map +1 -1
- package/dist/server/master/queue.d.ts +1 -1
- package/dist/server/master/queue.js +14 -6
- package/dist/server/master/queue.js.map +1 -1
- package/dist/server/master/runner.d.ts +6 -6
- package/dist/server/master/runner.js +98 -130
- package/dist/server/master/runner.js.map +1 -1
- package/dist/server/master/server.d.ts +1 -1
- package/dist/server/master/server.js +193 -88
- package/dist/server/master/server.js.map +1 -1
- package/dist/server/master/start.d.ts +1 -2
- package/dist/server/master/start.js +13 -29
- package/dist/server/master/start.js.map +1 -1
- package/dist/server/master/testsManager.d.ts +81 -0
- package/dist/server/master/testsManager.js +282 -0
- package/dist/server/master/testsManager.js.map +1 -0
- package/dist/server/playwright/docker-file.d.ts +1 -1
- package/dist/server/playwright/docker-file.js +17 -8
- package/dist/server/playwright/docker-file.js.map +1 -1
- package/dist/server/playwright/docker.d.ts +2 -1
- package/dist/server/playwright/docker.js +10 -2
- package/dist/server/playwright/docker.js.map +1 -1
- package/dist/server/playwright/index-source.mjs +16 -0
- package/dist/server/playwright/internal.d.ts +7 -7
- package/dist/server/playwright/internal.js +144 -84
- package/dist/server/playwright/internal.js.map +1 -1
- package/dist/server/playwright/webdriver.d.ts +3 -3
- package/dist/server/playwright/webdriver.js +0 -6
- package/dist/server/playwright/webdriver.js.map +1 -1
- package/dist/server/providers/browser.js +4 -3
- package/dist/server/providers/browser.js.map +1 -1
- package/dist/server/providers/hybrid.js +2 -2
- package/dist/server/providers/hybrid.js.map +1 -1
- package/dist/server/report.d.ts +10 -0
- package/dist/server/report.js +45 -0
- package/dist/server/report.js.map +1 -0
- package/dist/server/reporters/creevey.d.ts +7 -0
- package/dist/server/reporters/creevey.js +63 -0
- package/dist/server/reporters/creevey.js.map +1 -0
- package/dist/server/reporters/index.d.ts +2 -0
- package/dist/server/reporters/index.js +16 -0
- package/dist/server/reporters/index.js.map +1 -0
- package/dist/server/reporters/junit.d.ts +16 -0
- package/dist/server/reporters/junit.js +167 -0
- package/dist/server/reporters/junit.js.map +1 -0
- package/dist/server/reporters/teamcity.d.ts +7 -0
- package/dist/server/reporters/teamcity.js +60 -0
- package/dist/server/reporters/teamcity.js.map +1 -0
- package/dist/server/selenium/internal.d.ts +4 -4
- package/dist/server/selenium/internal.js +56 -40
- package/dist/server/selenium/internal.js.map +1 -1
- package/dist/server/selenium/selenoid.js +12 -6
- package/dist/server/selenium/selenoid.js.map +1 -1
- package/dist/server/selenium/webdriver.d.ts +3 -3
- package/dist/server/selenium/webdriver.js +4 -8
- package/dist/server/selenium/webdriver.js.map +1 -1
- package/dist/server/shutdown.d.ts +1 -0
- package/dist/server/shutdown.js +23 -0
- package/dist/server/shutdown.js.map +1 -0
- package/dist/server/stories.d.ts +0 -1
- package/dist/server/stories.js +0 -12
- package/dist/server/stories.js.map +1 -1
- package/dist/server/telemetry.js +3 -3
- package/dist/server/telemetry.js.map +1 -1
- package/dist/server/testsFiles/parser.js +45 -5
- package/dist/server/testsFiles/parser.js.map +1 -1
- package/dist/server/utils.d.ts +23 -0
- package/dist/server/utils.js +114 -15
- package/dist/server/utils.js.map +1 -1
- package/dist/server/webdriver.d.ts +1 -1
- package/dist/server/worker/context.d.ts +3 -0
- package/dist/server/worker/context.js +15 -0
- package/dist/server/worker/context.js.map +1 -0
- package/dist/server/worker/match-image.d.ts +8 -12
- package/dist/server/worker/match-image.js +11 -178
- package/dist/server/worker/match-image.js.map +1 -1
- package/dist/server/worker/start.d.ts +2 -2
- package/dist/server/worker/start.js +41 -64
- package/dist/server/worker/start.js.map +1 -1
- package/dist/shared/index.d.ts +1 -1
- package/dist/shared/index.js +9 -7
- package/dist/shared/index.js.map +1 -1
- package/dist/types.d.ts +84 -43
- package/dist/types.js +65 -1
- package/dist/types.js.map +1 -1
- package/docs/cli.md +80 -0
- package/docs/config.md +179 -165
- package/docs/examples/playwright-reporer/playwright.config.ts +37 -0
- package/docs/migration-0.9-to-0.10.md +144 -0
- package/docs/playwright-reporter.md +357 -0
- package/docs/storybook.md +60 -0
- package/docs/tests.md +50 -45
- package/package.json +78 -83
- package/playwright.config.mts +46 -0
- package/src/client/addon/components/Addon.tsx +1 -1
- package/src/client/addon/components/Panel.tsx +4 -4
- package/src/client/addon/components/TestSelect.tsx +2 -2
- package/src/client/addon/components/Tools.tsx +2 -2
- package/src/client/addon/controller.ts +4 -4
- package/src/client/addon/makeDecorator.ts +69 -0
- package/src/client/addon/manager.ts +38 -37
- package/src/client/addon/preset.ts +2 -1
- package/src/client/addon/withCreevey.ts +16 -19
- package/src/client/shared/components/ImagesView/BlendView.tsx +1 -1
- package/src/client/shared/components/ImagesView/ImagesView.tsx +1 -1
- package/src/client/shared/components/ImagesView/SideBySideView.tsx +2 -2
- package/src/client/shared/components/ImagesView/SlideView.tsx +2 -2
- package/src/client/shared/components/ImagesView/SwapView.tsx +20 -2
- package/src/client/shared/components/ImagesView/common.ts +1 -1
- package/src/client/shared/components/PageFooter/PageFooter.tsx +1 -1
- package/src/client/shared/components/PageFooter/Paging.tsx +1 -1
- package/src/client/shared/components/PageHeader/ImagePreview.tsx +2 -1
- package/src/client/shared/components/PageHeader/PageHeader.tsx +23 -7
- package/src/client/shared/components/ResultsPage.tsx +33 -10
- package/src/client/shared/creeveyClientApi.ts +19 -1
- package/src/client/shared/helpers.ts +4 -24
- package/src/client/web/CreeveyApp.tsx +30 -9
- package/src/client/web/CreeveyContext.tsx +11 -0
- package/src/client/web/CreeveyLoader.tsx +2 -2
- package/src/client/web/CreeveyView/SideBar/Checkbox.tsx +3 -3
- package/src/client/web/CreeveyView/SideBar/Search.tsx +4 -4
- package/src/client/web/CreeveyView/SideBar/SideBar.tsx +11 -6
- package/src/client/web/CreeveyView/SideBar/SideBarFooter.tsx +48 -15
- package/src/client/web/CreeveyView/SideBar/SideBarHeader.tsx +20 -5
- package/src/client/web/CreeveyView/SideBar/SuiteLink.tsx +12 -12
- package/src/client/web/CreeveyView/SideBar/TestLink.tsx +10 -10
- package/src/client/web/CreeveyView/SideBar/TestStatusIcon.tsx +2 -2
- package/src/client/web/CreeveyView/SideBar/TestsStatus.tsx +3 -2
- package/src/client/web/CreeveyView/SideBar/Toggle.tsx +1 -1
- package/src/client/web/KeyboardEventsContext.tsx +61 -73
- package/src/client/web/index.tsx +10 -5
- package/src/client/web/themes.ts +24 -0
- package/src/creevey.ts +92 -38
- package/src/playwright/generator.ts +322 -0
- package/src/playwright/helpers.ts +31 -0
- package/src/playwright/reporter.ts +381 -0
- package/src/playwright/setup.ts +84 -0
- package/src/playwright.ts +1 -0
- package/src/server/compare.ts +260 -0
- package/src/server/config.ts +52 -9
- package/src/server/connection.ts +26 -0
- package/src/server/docker.ts +62 -34
- package/src/server/index.ts +166 -79
- package/src/server/master/api.ts +94 -28
- package/src/server/master/handlers/capture-handler.ts +20 -0
- package/src/server/master/handlers/index.ts +4 -0
- package/src/server/master/handlers/ping-handler.ts +6 -0
- package/src/server/master/handlers/static-handler.ts +16 -0
- package/src/server/master/handlers/stories-handler.ts +20 -0
- package/src/server/master/master.ts +10 -27
- package/src/server/master/pool.ts +7 -3
- package/src/server/master/queue.ts +21 -7
- package/src/server/master/runner.ts +123 -134
- package/src/server/master/server.ts +214 -101
- package/src/server/master/start.ts +19 -41
- package/src/server/master/testsManager.ts +316 -0
- package/src/server/playwright/docker-file.ts +20 -8
- package/src/server/playwright/docker.ts +16 -3
- package/src/server/playwright/index-source.mjs +16 -0
- package/src/server/playwright/internal.ts +176 -103
- package/src/server/playwright/webdriver.ts +4 -10
- package/src/server/providers/browser.ts +4 -3
- package/src/server/providers/hybrid.ts +2 -3
- package/src/server/report.ts +51 -0
- package/src/server/reporters/creevey.ts +71 -0
- package/src/server/reporters/index.ts +11 -0
- package/src/server/reporters/junit.ts +207 -0
- package/src/server/reporters/teamcity.ts +74 -0
- package/src/server/selenium/internal.ts +70 -53
- package/src/server/selenium/selenoid.ts +13 -6
- package/src/server/selenium/webdriver.ts +8 -12
- package/src/server/shutdown.ts +19 -0
- package/src/server/stories.ts +1 -12
- package/src/server/telemetry.ts +3 -3
- package/src/server/testsFiles/parser.ts +52 -4
- package/src/server/utils.ts +124 -16
- package/src/server/webdriver.ts +1 -1
- package/src/server/worker/context.ts +14 -0
- package/src/server/worker/match-image.ts +16 -248
- package/src/server/worker/start.ts +49 -79
- package/src/shared/index.ts +10 -8
- package/src/types.ts +91 -58
- package/types/global.d.ts +1 -0
- package/dist/client/web/assets/index-DB8lHlJw.js +0 -591
- package/dist/server/reporter.d.ts +0 -26
- package/dist/server/reporter.js +0 -108
- package/dist/server/reporter.js.map +0 -1
- package/dist/server/update.d.ts +0 -2
- package/dist/server/update.js +0 -53
- package/dist/server/update.js.map +0 -1
- package/src/server/reporter.ts +0 -139
- package/src/server/update.ts +0 -74
@@ -1,174 +1,19 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
3
|
exports.getMatchers = getMatchers;
|
7
4
|
exports.getOdiffMatchers = getOdiffMatchers;
|
8
|
-
const path_1 = __importDefault(require("path"));
|
9
|
-
const promises_1 = require("fs/promises");
|
10
|
-
const odiff_bin_1 = require("odiff-bin");
|
11
|
-
const pngjs_1 = require("pngjs");
|
12
5
|
const types_js_1 = require("../../types.js");
|
13
|
-
const
|
14
|
-
|
15
|
-
|
16
|
-
return await (0, promises_1.stat)(filePath);
|
17
|
-
}
|
18
|
-
catch (error) {
|
19
|
-
if (typeof error == 'object' && error && error.code === 'ENOENT') {
|
20
|
-
return null;
|
21
|
-
}
|
22
|
-
throw error;
|
23
|
-
}
|
24
|
-
}
|
25
|
-
async function getLastImageNumber(imageDir, imageName) {
|
26
|
-
const actualImagesRegexp = new RegExp(`${imageName}-actual-(\\d+)\\.png`);
|
27
|
-
try {
|
28
|
-
return ((await (0, promises_1.readdir)(imageDir))
|
29
|
-
.map((filename) => filename.replace(actualImagesRegexp, '$1'))
|
30
|
-
.map(Number)
|
31
|
-
.filter((x) => !isNaN(x))
|
32
|
-
.sort((a, b) => b - a)[0] ?? 0);
|
33
|
-
}
|
34
|
-
catch (_error) {
|
35
|
-
return 0;
|
36
|
-
}
|
37
|
-
}
|
38
|
-
async function readExpected(expectImageDir, imageName) {
|
39
|
-
const expected = await (0, promises_1.readFile)(path_1.default.join(expectImageDir, `${imageName}.png`));
|
40
|
-
return expected;
|
41
|
-
}
|
42
|
-
async function saveImages(imageDir, images) {
|
43
|
-
const files = [];
|
44
|
-
await (0, promises_1.mkdir)(imageDir, { recursive: true });
|
45
|
-
for (const { name, data } of images) {
|
46
|
-
const filePath = path_1.default.join(imageDir, name);
|
47
|
-
await (0, promises_1.writeFile)(filePath, data);
|
48
|
-
files.push(filePath);
|
49
|
-
}
|
50
|
-
return files;
|
51
|
-
}
|
52
|
-
async function getImagePaths(config, testFullPath, assertImageName) {
|
53
|
-
const testPath = [...testFullPath];
|
54
|
-
const imageName = assertImageName ?? testPath.pop();
|
55
|
-
(0, assert_1.default)(typeof imageName === 'string', `Can't get image name from empty test scope`);
|
56
|
-
const expectImageDir = path_1.default.join(config.screenDir, ...testPath);
|
57
|
-
const reportImageDir = path_1.default.join(config.reportDir, ...testPath);
|
58
|
-
const imageNumber = (await getLastImageNumber(reportImageDir, imageName)) + 1;
|
59
|
-
const actualImageName = `${imageName}-actual-${imageNumber}.png`;
|
60
|
-
const expectImageName = `${imageName}-expect-${imageNumber}.png`;
|
61
|
-
const diffImageName = `${imageName}-diff-${imageNumber}.png`;
|
62
|
-
return { imageName, actualImageName, expectImageName, diffImageName, expectImageDir, reportImageDir };
|
63
|
-
}
|
64
|
-
async function getExpected(ctx, { imageName, actualImageName, expectImageName, diffImageName, expectImageDir, reportImageDir }) {
|
65
|
-
const onCompare = async (actual, expect, diff) => {
|
66
|
-
const imagesMeta = [];
|
67
|
-
const image = (ctx.images[imageName] = ctx.images[imageName] ?? { actual: actualImageName });
|
68
|
-
imagesMeta.push({ name: image.actual, data: actual });
|
69
|
-
if (diff && expect) {
|
70
|
-
image.expect = expectImageName;
|
71
|
-
image.diff = diffImageName;
|
72
|
-
imagesMeta.push({ name: image.expect, data: expect });
|
73
|
-
imagesMeta.push({ name: image.diff, data: diff });
|
74
|
-
}
|
75
|
-
ctx.attachments = await saveImages(reportImageDir, imagesMeta);
|
76
|
-
};
|
77
|
-
const expectImageStat = await getStat(path_1.default.join(expectImageDir, `${imageName}.png`));
|
78
|
-
if (!expectImageStat)
|
79
|
-
return { expected: null, onCompare };
|
80
|
-
const expected = await readExpected(expectImageDir, imageName);
|
81
|
-
return { expected, onCompare };
|
82
|
-
}
|
83
|
-
async function getOdiffExpected(ctx, actual, { imageName, actualImageName, expectImageName, diffImageName, expectImageDir, reportImageDir }) {
|
84
|
-
const expected = await readExpected(expectImageDir, imageName);
|
85
|
-
const image = (ctx.images[imageName] = ctx.images[imageName] ?? { actual: actualImageName });
|
86
|
-
image.expect = expectImageName;
|
87
|
-
image.diff = diffImageName;
|
88
|
-
const imagesMeta = [
|
89
|
-
{ name: image.actual, data: actual },
|
90
|
-
{ name: expectImageName, data: expected },
|
91
|
-
];
|
92
|
-
ctx.attachments = await saveImages(reportImageDir, imagesMeta);
|
93
|
-
return {
|
94
|
-
actual: path_1.default.join(reportImageDir, actualImageName),
|
95
|
-
expect: path_1.default.join(reportImageDir, expectImageName),
|
96
|
-
diff: path_1.default.join(reportImageDir, diffImageName),
|
97
|
-
};
|
98
|
-
}
|
99
|
-
function normalizeImageSize(image, width, height) {
|
100
|
-
const normalizedImage = Buffer.alloc(4 * width * height);
|
101
|
-
for (let y = 0; y < height; y++) {
|
102
|
-
for (let x = 0; x < width; x++) {
|
103
|
-
const i = (y * width + x) * 4;
|
104
|
-
if (x < image.width && y < image.height) {
|
105
|
-
const j = (y * image.width + x) * 4;
|
106
|
-
normalizedImage[i + 0] = image.data[j + 0];
|
107
|
-
normalizedImage[i + 1] = image.data[j + 1];
|
108
|
-
normalizedImage[i + 2] = image.data[j + 2];
|
109
|
-
normalizedImage[i + 3] = image.data[j + 3];
|
110
|
-
}
|
111
|
-
else {
|
112
|
-
normalizedImage[i + 0] = 0;
|
113
|
-
normalizedImage[i + 1] = 0;
|
114
|
-
normalizedImage[i + 2] = 0;
|
115
|
-
normalizedImage[i + 3] = 0;
|
116
|
-
}
|
117
|
-
}
|
118
|
-
}
|
119
|
-
return normalizedImage;
|
120
|
-
}
|
121
|
-
function hasDiffPixels(diff) {
|
122
|
-
for (let i = 0; i < diff.length; i += 4) {
|
123
|
-
if (diff[i + 0] == 255 && diff[i + 1] == 0 && diff[i + 2] == 0 && diff[i + 3] == 255)
|
124
|
-
return true;
|
125
|
-
}
|
126
|
-
return false;
|
127
|
-
}
|
128
|
-
function compareImages(expect, actual, pixelmatch, diffOptions) {
|
129
|
-
const expectImage = pngjs_1.PNG.sync.read(expect);
|
130
|
-
const actualImage = pngjs_1.PNG.sync.read(actual);
|
131
|
-
const width = Math.max(actualImage.width, expectImage.width);
|
132
|
-
const height = Math.max(actualImage.height, expectImage.height);
|
133
|
-
const diffImage = new pngjs_1.PNG({ width, height });
|
134
|
-
let actualImageData = actualImage.data;
|
135
|
-
if (actualImage.width < width || actualImage.height < height) {
|
136
|
-
actualImageData = normalizeImageSize(actualImage, width, height);
|
137
|
-
}
|
138
|
-
let expectImageData = expectImage.data;
|
139
|
-
if (expectImage.width < width || expectImage.height < height) {
|
140
|
-
expectImageData = normalizeImageSize(expectImage, width, height);
|
141
|
-
}
|
142
|
-
pixelmatch(expectImageData, actualImageData, diffImage.data, width, height, diffOptions);
|
143
|
-
return {
|
144
|
-
isEqual: !hasDiffPixels(diffImage.data),
|
145
|
-
diff: pngjs_1.PNG.sync.write(diffImage),
|
146
|
-
};
|
6
|
+
const compare_js_1 = require("../compare.js");
|
7
|
+
function toBuffer(bufferOrBase64) {
|
8
|
+
return typeof bufferOrBase64 === 'string' ? Buffer.from(bufferOrBase64, 'base64') : bufferOrBase64;
|
147
9
|
}
|
148
10
|
async function getMatchers(ctx, config) {
|
149
11
|
// TODO Replace with `import from`
|
150
12
|
const { default: pixelmatch } = await import('pixelmatch');
|
151
|
-
|
152
|
-
const { expected, onCompare } = await getExpected(ctx, await getImagePaths(config, ctx.testFullPath, imageName));
|
153
|
-
if (expected == null) {
|
154
|
-
await onCompare(actual);
|
155
|
-
return imageName ? `Expected image '${imageName}' does not exists` : 'Expected image does not exists';
|
156
|
-
}
|
157
|
-
if (actual.equals(expected)) {
|
158
|
-
await onCompare(actual);
|
159
|
-
return;
|
160
|
-
}
|
161
|
-
const { isEqual, diff } = compareImages(expected, actual, pixelmatch, config.diffOptions);
|
162
|
-
if (isEqual) {
|
163
|
-
await onCompare(actual);
|
164
|
-
return;
|
165
|
-
}
|
166
|
-
await onCompare(actual, expected, diff);
|
167
|
-
return imageName ? `Expected image '${imageName}' to match` : 'Expected image to match';
|
168
|
-
}
|
13
|
+
const assertImage = (0, compare_js_1.getPixelmatchAssert)(pixelmatch, ctx, config);
|
169
14
|
return {
|
170
15
|
matchImage: async (image, imageName) => {
|
171
|
-
const errorMessage = await assertImage(image, imageName);
|
16
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
172
17
|
if (errorMessage) {
|
173
18
|
throw createImageError(imageName ? { [imageName]: errorMessage } : errorMessage);
|
174
19
|
}
|
@@ -176,7 +21,7 @@ async function getMatchers(ctx, config) {
|
|
176
21
|
matchImages: async (images) => {
|
177
22
|
const errors = {};
|
178
23
|
await Promise.all(Object.entries(images).map(async ([imageName, image]) => {
|
179
|
-
const errorMessage = await assertImage(image, imageName);
|
24
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
180
25
|
if (errorMessage) {
|
181
26
|
errors[imageName] = errorMessage;
|
182
27
|
}
|
@@ -192,24 +37,12 @@ function createImageError(imageErrors) {
|
|
192
37
|
error.images = imageErrors;
|
193
38
|
return error;
|
194
39
|
}
|
195
|
-
function getOdiffMatchers(ctx, config) {
|
196
|
-
const
|
197
|
-
|
198
|
-
noFailOnFsErrors: true,
|
199
|
-
};
|
200
|
-
async function assertImage(image, imageName) {
|
201
|
-
const { actual, expect, diff } = await getOdiffExpected(ctx, image, await getImagePaths(config, ctx.testFullPath, imageName));
|
202
|
-
const result = await (0, odiff_bin_1.compare)(actual, expect, diff, diffOptions);
|
203
|
-
if (!result.match) {
|
204
|
-
if (result.reason == 'file-not-exists') {
|
205
|
-
return imageName ? `Expected image '${imageName}' does not exists` : 'Expected image does not exists';
|
206
|
-
}
|
207
|
-
return imageName ? `Expected image '${imageName}' to match` : 'Expected image to match';
|
208
|
-
}
|
209
|
-
}
|
40
|
+
async function getOdiffMatchers(ctx, config) {
|
41
|
+
const { compare } = await import('odiff-bin');
|
42
|
+
const assertImage = (0, compare_js_1.getOdiffAssert)(compare, ctx, config);
|
210
43
|
return {
|
211
44
|
matchImage: async (image, imageName) => {
|
212
|
-
const errorMessage = await assertImage(image, imageName);
|
45
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
213
46
|
if (errorMessage) {
|
214
47
|
throw createImageError(imageName ? { [imageName]: errorMessage } : errorMessage);
|
215
48
|
}
|
@@ -217,7 +50,7 @@ function getOdiffMatchers(ctx, config) {
|
|
217
50
|
matchImages: async (images) => {
|
218
51
|
const errors = {};
|
219
52
|
await Promise.all(Object.entries(images).map(async ([imageName, image]) => {
|
220
|
-
const errorMessage = await assertImage(image, imageName);
|
53
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
221
54
|
if (errorMessage) {
|
222
55
|
errors[imageName] = errorMessage;
|
223
56
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"match-image.js","sourceRoot":"","sources":["../../../src/server/worker/match-image.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"match-image.js","sourceRoot":"","sources":["../../../src/server/worker/match-image.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
import { Config,
|
2
|
-
export declare function start(browser: string, gridUrl: string, config: Config, options:
|
1
|
+
import { Config, WorkerOptions } from '../../types.js';
|
2
|
+
export declare function start(browser: string, gridUrl: string, config: Config, options: WorkerOptions): Promise<void>;
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.start = start;
|
7
7
|
const chai_1 = __importDefault(require("chai"));
|
8
|
-
const events_1 = __importDefault(require("events"));
|
9
8
|
const types_js_1 = require("../../types.js");
|
10
9
|
const messages_js_1 = require("../messages.js");
|
11
10
|
const chai_image_js_1 = __importDefault(require("./chai-image.js"));
|
@@ -28,9 +27,10 @@ async function getTestsFromStories(config, browserName, webdriver) {
|
|
28
27
|
.forEach((test) => testsById.set(test.id, test));
|
29
28
|
return testsById;
|
30
29
|
}
|
31
|
-
function runHandler(browserName,
|
30
|
+
function runHandler(browserName, result, error) {
|
32
31
|
// TODO How handle browser corruption?
|
33
|
-
|
32
|
+
const { images } = result;
|
33
|
+
if (images != null && (0, types_js_1.isImageError)(error)) {
|
34
34
|
if (typeof error.images == 'string') {
|
35
35
|
const image = images[browserName];
|
36
36
|
if (image)
|
@@ -45,11 +45,12 @@ function runHandler(browserName, images, error) {
|
|
45
45
|
});
|
46
46
|
}
|
47
47
|
}
|
48
|
-
if (error || Object.values(images).some((image) => image?.error != null)) {
|
49
|
-
|
48
|
+
if (error || (images != null && Object.values(images).some((image) => image?.error != null))) {
|
49
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
50
|
+
const errorMessage = result.error;
|
50
51
|
const isUnexpectedError = hasTimeout(errorMessage) ||
|
51
52
|
hasDisconnected(errorMessage) ||
|
52
|
-
Object.values(images).some((image) => hasTimeout(image?.error));
|
53
|
+
(images != null && Object.values(images).some((image) => hasTimeout(image?.error)));
|
53
54
|
if (isUnexpectedError)
|
54
55
|
(0, messages_js_1.emitWorkerMessage)({ type: 'error', payload: { subtype: 'unknown', error: errorMessage } });
|
55
56
|
else
|
@@ -57,13 +58,18 @@ function runHandler(browserName, images, error) {
|
|
57
58
|
type: 'end',
|
58
59
|
payload: {
|
59
60
|
status: 'failed',
|
60
|
-
|
61
|
-
error: errorMessage,
|
61
|
+
...result,
|
62
62
|
},
|
63
63
|
});
|
64
64
|
}
|
65
65
|
else {
|
66
|
-
(0, messages_js_1.emitTestMessage)({
|
66
|
+
(0, messages_js_1.emitTestMessage)({
|
67
|
+
type: 'end',
|
68
|
+
payload: {
|
69
|
+
status: 'success',
|
70
|
+
...result,
|
71
|
+
},
|
72
|
+
});
|
67
73
|
}
|
68
74
|
}
|
69
75
|
async function setupWebdriver(webdriver) {
|
@@ -92,7 +98,6 @@ function hasTimeout(str) {
|
|
92
98
|
return str?.toLowerCase().includes('timeout') ?? false;
|
93
99
|
}
|
94
100
|
async function start(browser, gridUrl, config, options) {
|
95
|
-
let retries = 0;
|
96
101
|
const imagesContext = {
|
97
102
|
attachments: [],
|
98
103
|
testFullPath: [],
|
@@ -102,27 +107,8 @@ async function start(browser, gridUrl, config, options) {
|
|
102
107
|
const [sessionId, webdriver] = (await setupWebdriver(new Webdriver(browser, gridUrl, config, options))) ?? [];
|
103
108
|
if (!webdriver || !sessionId)
|
104
109
|
return;
|
105
|
-
const reporterOptions = {
|
106
|
-
...config.reporterOptions,
|
107
|
-
creevey: {
|
108
|
-
sessionId,
|
109
|
-
reportDir: config.reportDir,
|
110
|
-
browserName: browser,
|
111
|
-
get willRetry() {
|
112
|
-
return retries < config.maxRetries;
|
113
|
-
},
|
114
|
-
get images() {
|
115
|
-
return imagesContext.images;
|
116
|
-
},
|
117
|
-
},
|
118
|
-
};
|
119
|
-
class FakeRunner extends events_1.default {
|
120
|
-
}
|
121
|
-
const runner = new FakeRunner();
|
122
|
-
const Reporter = config.reporter;
|
123
|
-
new Reporter(runner, { reporterOptions });
|
124
110
|
const { matchImage, matchImages } = options.odiff
|
125
|
-
? (0, match_image_js_1.getOdiffMatchers)(imagesContext, config)
|
111
|
+
? await (0, match_image_js_1.getOdiffMatchers)(imagesContext, config)
|
126
112
|
: await (0, match_image_js_1.getMatchers)(imagesContext, config);
|
127
113
|
chai_1.default.use((0, chai_image_js_1.default)(matchImage, matchImages));
|
128
114
|
const tests = await (async () => {
|
@@ -167,33 +153,17 @@ async function start(browser, gridUrl, config, options) {
|
|
167
153
|
imagesContext.attachments = [];
|
168
154
|
imagesContext.testFullPath = (0, utils_js_1.getTestPath)(test);
|
169
155
|
imagesContext.images = {};
|
170
|
-
retries = message.payload.retries;
|
171
156
|
let error = undefined;
|
172
|
-
const fakeSuite = {
|
173
|
-
title: test.storyPath.slice(0, -1).join('/'),
|
174
|
-
fullTitle: () => fakeSuite.title,
|
175
|
-
titlePath: () => [fakeSuite.title],
|
176
|
-
tests: [],
|
177
|
-
};
|
178
|
-
const fakeTest = {
|
179
|
-
parent: fakeSuite,
|
180
|
-
title: [test.story.name, test.testName, test.browser].filter(types_js_1.isDefined).join('/'),
|
181
|
-
fullTitle: () => (0, utils_js_1.getTestPath)(test).join('/'),
|
182
|
-
titlePath: () => (0, utils_js_1.getTestPath)(test),
|
183
|
-
currentRetry: () => retries,
|
184
|
-
retires: () => config.maxRetries,
|
185
|
-
slow: () => 1000,
|
186
|
-
};
|
187
|
-
fakeSuite.tests.push(fakeTest);
|
188
157
|
void (async () => {
|
189
|
-
|
190
|
-
|
158
|
+
let timeout;
|
159
|
+
let isRejected = false;
|
191
160
|
const start = Date.now();
|
192
161
|
try {
|
193
162
|
await Promise.race([
|
194
|
-
new Promise((reject) => setTimeout(() => {
|
195
|
-
|
196
|
-
|
163
|
+
new Promise((_, reject) => (timeout = setTimeout(() => {
|
164
|
+
isRejected = true;
|
165
|
+
reject(new Error(`Timeout of ${config.testTimeout}ms exceeded`));
|
166
|
+
}, config.testTimeout))),
|
197
167
|
(async () => {
|
198
168
|
const context = await webdriver.switchStory(test.story, baseContext);
|
199
169
|
await test.fn(context);
|
@@ -202,23 +172,30 @@ async function start(browser, gridUrl, config, options) {
|
|
202
172
|
}
|
203
173
|
catch (testError) {
|
204
174
|
error = testError;
|
205
|
-
fakeTest.err = error;
|
206
175
|
}
|
207
176
|
const duration = Date.now() - start;
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
177
|
+
clearTimeout(timeout);
|
178
|
+
await webdriver.afterTest(test);
|
179
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
180
|
+
if (isRejected) {
|
181
|
+
(0, messages_js_1.emitWorkerMessage)({
|
182
|
+
type: 'error',
|
183
|
+
payload: { subtype: 'unknown', error: serializeError(error) },
|
184
|
+
});
|
214
185
|
}
|
215
186
|
else {
|
216
|
-
|
187
|
+
const result = {
|
188
|
+
sessionId,
|
189
|
+
browserName: baseContext.browserName,
|
190
|
+
workerId: process.pid,
|
191
|
+
images: imagesContext.images,
|
192
|
+
error: error ? serializeError(error) : undefined,
|
193
|
+
duration,
|
194
|
+
attachments: imagesContext.attachments,
|
195
|
+
retries: message.payload.retries,
|
196
|
+
};
|
197
|
+
runHandler(baseContext.browserName, result, error);
|
217
198
|
}
|
218
|
-
runner.emit(types_js_1.TEST_EVENTS.TEST_END, fakeTest);
|
219
|
-
runner.emit(types_js_1.TEST_EVENTS.RUN_END);
|
220
|
-
await webdriver.afterTest(test);
|
221
|
-
runHandler(baseContext.browserName, imagesContext.images, error);
|
222
199
|
})().catch((error) => {
|
223
200
|
(0, logger_js_1.logger)().error('Unexpected error:', error);
|
224
201
|
(0, messages_js_1.emitWorkerMessage)({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/server/worker/start.ts"],"names":[],"mappings":";;;;;
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/server/worker/start.ts"],"names":[],"mappings":";;;;;AAqHA,sBA2HC;AAhPD,gDAAwB;AACxB,6CAUwB;AACxB,gDAAiF;AACjF,oEAAwC;AACxC,qDAAiE;AACjE,8CAAqD;AACrD,4CAAsC;AACtC,0CAA0C;AAG1C,KAAK,UAAU,mBAAmB,CAChC,MAAc,EACd,WAAmB,EACnB,SAA2B;IAE3B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsB,CAAC;IAChD,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAoB,EACtC,CAAC,WAAW,CAAC,EACb,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,EACjE,CAAC,SAAS,EAAE,EAAE;QACZ,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE;YAClD,IAAI,OAAO;gBAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;;gBACnC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;IAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;SACjB,MAAM,CAAC,oBAAS,CAAC;SACjB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IAEnD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,UAAU,CAAC,WAAmB,EAAE,MAAkC,EAAE,KAAe;IAC1F,sCAAsC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1B,IAAI,MAAM,IAAI,IAAI,IAAI,IAAA,uBAAY,EAAC,KAAK,CAAC,EAAE,CAAC;QAC1C,IAAI,OAAO,KAAK,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;YAClC,IAAI,KAAK;gBAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;gBAChC,IAAI,KAAK;oBAAE,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC;QAC7F,oEAAoE;QACpE,MAAM,YAAY,GAAG,MAAM,CAAC,KAAM,CAAC;QAEnC,MAAM,iBAAiB,GACrB,UAAU,CAAC,YAAY,CAAC;YACxB,eAAe,CAAC,YAAY,CAAC;YAC7B,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACtF,IAAI,iBAAiB;YAAE,IAAA,+BAAiB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;;YAEhH,IAAA,6BAAe,EAAC;gBACd,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE;oBACP,MAAM,EAAE,QAAQ;oBAChB,GAAG,MAAM;iBACV;aACF,CAAC,CAAC;IACP,CAAC;SAAM,CAAC;QACN,IAAA,6BAAe,EAAC;YACd,IAAI,EAAE,KAAK;YACX,OAAO,EAAE;gBACP,MAAM,EAAE,SAAS;gBACjB,GAAG,MAAM;aACV;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,SAA2B;IACvD,IAAI,CAAC,MAAM,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAChD,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC1C,IAAA,+BAAiB,EAAC;YAChB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,yBAAyB,EAAE;SAClE,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;IAEjD,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,KAAK;QAAE,OAAO,eAAe,CAAC;IACnC,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC;IAChE,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAgB,CAAC;AAC/E,CAAC;AAED,SAAS,eAAe,CAAC,GAA8B;IACrD,OAAO,GAAG,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC;AAC9D,CAAC;AAED,SAAS,UAAU,CAAC,GAA8B;IAChD,OAAO,GAAG,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC;AACzD,CAAC;AAEM,KAAK,UAAU,KAAK,CAAC,OAAe,EAAE,OAAe,EAAE,MAAc,EAAE,OAAsB;IAClG,MAAM,aAAa,GAAiB;QAClC,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,MAAM,EAAE,EAAE;KACX,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,cAAc,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAE9G,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS;QAAE,OAAO;IAErC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,KAAK;QAC/C,CAAC,CAAC,MAAM,IAAA,iCAAgB,EAAC,aAAa,EAAE,MAAM,CAAC;QAC/C,CAAC,CAAC,MAAM,IAAA,4BAAW,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC7C,cAAI,CAAC,GAAG,CAAC,IAAA,uBAAS,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QAC9B,IAAI,CAAC;YACH,OAAO,MAAM,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAC3D,IAAA,+BAAiB,EAAC;gBAChB,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE;aAC9D,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,IAAI,CAAC,KAAK;QAAE,OAAO;IAEnB,IAAA,yBAAW,EAAC,MAAM,EAAE,CAAC,OAAoB,EAAE,EAAE;QAC3C,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO;YAAE,OAAO;QAEpC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,gBAAgB,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC;YAC7D,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtB,IAAA,+BAAiB,EAAC;gBAChB,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;aACpC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAA2B;YAC1C,WAAW,EAAE,OAAO;YACpB,4EAA4E;YAC5E,mEAAmE;YACnE,SAAS,EAAE,SAAS,CAAC,OAAO;YAC5B,WAAW,EAAE,EAAE;YAEf,UAAU,EAAE,UAAU;YACtB,WAAW,EAAE,WAAW;YAExB,mBAAmB;YACnB,MAAM,EAAE,cAAI,CAAC,MAAM;SACpB,CAAC;QAEF,aAAa,CAAC,WAAW,GAAG,EAAE,CAAC;QAC/B,aAAa,CAAC,YAAY,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,CAAC;QAC/C,aAAa,CAAC,MAAM,GAAG,EAAE,CAAC;QAE1B,IAAI,KAAK,GAAG,SAAS,CAAC;QAEtB,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,IAAI,OAAO,CAAC;YACZ,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,IAAI,CAAC;oBACjB,IAAI,OAAO,CACT,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CACZ,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;wBACzB,UAAU,GAAG,IAAI,CAAC;wBAClB,MAAM,CAAC,IAAI,KAAK,CAAC,cAAc,MAAM,CAAC,WAAW,aAAa,CAAC,CAAC,CAAC;oBACnE,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAC1B;oBACD,CAAC,KAAK,IAAI,EAAE;wBACV,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;wBACrE,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;oBACzB,CAAC,CAAC,EAAE;iBACL,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,SAAS,EAAE,CAAC;gBACnB,KAAK,GAAG,SAAS,CAAC;YACpB,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACpC,YAAY,CAAC,OAAO,CAAC,CAAC;YAEtB,MAAM,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAEhC,uEAAuE;YACvE,IAAI,UAAU,EAAE,CAAC;gBACf,IAAA,+BAAiB,EAAC;oBAChB,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE;iBAC9D,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG;oBACb,SAAS;oBACT,WAAW,EAAE,WAAW,CAAC,WAAW;oBACpC,QAAQ,EAAE,OAAO,CAAC,GAAG;oBACrB,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;oBAChD,QAAQ;oBACR,WAAW,EAAE,aAAa,CAAC,WAAW;oBACtC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;iBACjC,CAAC;gBACF,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;QACH,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YAC5B,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC3C,IAAA,+BAAiB,EAAC;gBAChB,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE;aAC3D,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAElC,IAAA,+BAAiB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AACvC,CAAC"}
|
package/dist/shared/index.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { Parameters } from '
|
1
|
+
import type { Parameters } from 'storybook/internal/types';
|
2
2
|
import { SetStoriesData, StoriesRaw, StoryInput } from '../types.js';
|
3
3
|
export declare const combineParameters: (...parameterSets: Parameters[]) => Parameters;
|
4
4
|
export declare const denormalizeStoryParameters: ({ globalParameters, kindParameters, stories, }: SetStoriesData) => StoriesRaw;
|
package/dist/shared/index.js
CHANGED
@@ -4,12 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.deserializeStory = exports.deserializeRawStories = exports.serializeRawStories = exports.denormalizeStoryParameters = exports.combineParameters = void 0;
|
7
|
-
const
|
7
|
+
const mapValues_js_1 = __importDefault(require("lodash/mapValues.js"));
|
8
|
+
const mergeWith_js_1 = __importDefault(require("lodash/mergeWith.js"));
|
9
|
+
const cloneDeepWith_js_1 = __importDefault(require("lodash/cloneDeepWith.js"));
|
8
10
|
const serializeRegExp_js_1 = require("./serializeRegExp.js");
|
9
11
|
// NOTE: Copy-paste from storybook/api
|
10
12
|
const combineParameters = (...parameterSets) =>
|
11
13
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
12
|
-
|
14
|
+
(0, mergeWith_js_1.default)({}, ...parameterSets, (_, srcValue) => {
|
13
15
|
// Treat arrays as scalars:
|
14
16
|
if (Array.isArray(srcValue))
|
15
17
|
return srcValue;
|
@@ -18,14 +20,14 @@ lodash_1.default.mergeWith({}, ...parameterSets, (_, srcValue) => {
|
|
18
20
|
exports.combineParameters = combineParameters;
|
19
21
|
// NOTE: Copy-paste from storybook/api
|
20
22
|
const denormalizeStoryParameters = ({ globalParameters, kindParameters, stories, }) => {
|
21
|
-
return
|
23
|
+
return (0, mapValues_js_1.default)(stories, (storyData) => ({
|
22
24
|
...storyData,
|
23
25
|
parameters: (0, exports.combineParameters)(globalParameters, kindParameters[storyData.title] ?? {}, storyData.parameters),
|
24
26
|
}));
|
25
27
|
};
|
26
28
|
exports.denormalizeStoryParameters = denormalizeStoryParameters;
|
27
29
|
const serializeRawStories = (stories) => {
|
28
|
-
return
|
30
|
+
return (0, mapValues_js_1.default)(stories, (storyData) => {
|
29
31
|
const creevey = storyData.parameters.creevey;
|
30
32
|
if (creevey?.skip) {
|
31
33
|
return {
|
@@ -34,7 +36,7 @@ const serializeRawStories = (stories) => {
|
|
34
36
|
...storyData.parameters,
|
35
37
|
creevey: {
|
36
38
|
...creevey,
|
37
|
-
skip:
|
39
|
+
skip: (0, cloneDeepWith_js_1.default)(creevey.skip, (value) => {
|
38
40
|
if ((0, serializeRegExp_js_1.isRegExp)(value)) {
|
39
41
|
return (0, serializeRegExp_js_1.serializeRegExp)(value);
|
40
42
|
}
|
@@ -49,7 +51,7 @@ const serializeRawStories = (stories) => {
|
|
49
51
|
};
|
50
52
|
exports.serializeRawStories = serializeRawStories;
|
51
53
|
const deserializeRawStories = (stories) => {
|
52
|
-
return
|
54
|
+
return (0, mapValues_js_1.default)(stories, exports.deserializeStory);
|
53
55
|
};
|
54
56
|
exports.deserializeRawStories = deserializeRawStories;
|
55
57
|
const deserializeStory = (story) => {
|
@@ -61,7 +63,7 @@ const deserializeStory = (story) => {
|
|
61
63
|
...story.parameters,
|
62
64
|
creevey: {
|
63
65
|
...creevey,
|
64
|
-
skip:
|
66
|
+
skip: (0, cloneDeepWith_js_1.default)(creevey.skip, (value) => {
|
65
67
|
if ((0, serializeRegExp_js_1.isSerializedRegExp)(value)) {
|
66
68
|
return (0, serializeRegExp_js_1.deserializeRegExp)(value);
|
67
69
|
}
|
package/dist/shared/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":";;;;;;AAAA,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA4C;AAC5C,uEAA4C;AAC5C,+EAAoD;AAGpD,6DAAwG;AAExG,sCAAsC;AAC/B,MAAM,iBAAiB,GAAG,CAAC,GAAG,aAA2B,EAAc,EAAE;AAC9E,+DAA+D;AAC/D,IAAA,sBAAS,EAAC,EAAE,EAAE,GAAG,aAAa,EAAE,CAAC,CAAU,EAAE,QAAiB,EAAE,EAAE;IAChE,2BAA2B;IAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAqB,CAAC;IAE1D,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEL,sCAAsC;AAC/B,MAAM,0BAA0B,GAAG,CAAC,EACzC,gBAAgB,EAChB,cAAc,EACd,OAAO,GACQ,EAAc,EAAE;IAC/B,OAAO,IAAA,sBAAS,EAAC,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACxC,GAAG,SAAS;QACZ,UAAU,EAAE,IAAA,yBAAiB,EAAC,gBAAgB,EAAE,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,UAAU,CAAC;KAC7G,CAAC,CAAe,CAAC;AACpB,CAAC,CAAC;AATW,QAAA,0BAA0B,8BASrC;AAEK,MAAM,mBAAmB,GAAG,CAAC,OAAmB,EAAc,EAAE;IACrE,OAAO,IAAA,sBAAS,EAAC,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE;QACtC,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,OAAyC,CAAC;QAC/E,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;YAClB,OAAO;gBACL,GAAG,SAAS;gBACZ,UAAU,EAAE;oBACV,GAAG,SAAS,CAAC,UAAU;oBACvB,OAAO,EAAE;wBACP,GAAG,OAAO;wBACV,IAAI,EAAE,IAAA,0BAAa,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;4BAC1C,IAAI,IAAA,6BAAQ,EAAC,KAAK,CAAC,EAAE,CAAC;gCACpB,OAAO,IAAA,oCAAe,EAAC,KAAK,CAAC,CAAC;4BAChC,CAAC;4BACD,OAAO,SAAS,CAAC;wBACnB,CAAC,CAA+B;qBACjC;iBACF;aACF,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;AAEK,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAc,EAAE;IACvE,OAAO,IAAA,sBAAS,EAAC,OAAO,EAAE,wBAAgB,CAAC,CAAC;AAC9C,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,MAAM,gBAAgB,GAAG,CAAC,KAAiB,EAAc,EAAE;IAChE,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,OAAyC,CAAC;IAC3E,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;QAClB,OAAO;YACL,GAAG,KAAK;YACR,UAAU,EAAE;gBACV,GAAG,KAAK,CAAC,UAAU;gBACnB,OAAO,EAAE;oBACP,GAAG,OAAO;oBACV,IAAI,EAAE,IAAA,0BAAa,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;wBAC1C,IAAI,IAAA,uCAAkB,EAAC,KAAK,CAAC,EAAE,CAAC;4BAC9B,OAAO,IAAA,sCAAiB,EAAC,KAAK,CAAC,CAAC;wBAClC,CAAC;wBACD,OAAO,SAAS,CAAC;oBACnB,CAAC,CAA+B;iBACjC;aACF;SACF,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B"}
|