creevey 0.10.0-beta.41 → 0.10.0-beta.43
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/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/preview.d.ts +1 -1
- package/dist/client/addon/withCreevey.d.ts +2 -1
- package/dist/client/addon/withCreevey.js +2 -2
- package/dist/client/addon/withCreevey.js.map +1 -1
- package/dist/server/reporters/junit.js +4 -2
- package/dist/server/reporters/junit.js.map +1 -1
- package/package.json +1 -1
- package/src/client/addon/makeDecorator.ts +69 -0
- package/src/client/addon/withCreevey.ts +2 -1
- package/src/server/reporters/junit.ts +4 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const decorators: (
|
|
1
|
+
export declare const decorators: import("./makeDecorator.js").MakeDecoratorResult[];
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Addon_StoryWrapper } from '@storybook/types';
|
|
2
|
+
export interface MakeDecoratorOptions {
|
|
3
|
+
name: string;
|
|
4
|
+
parameterName: string;
|
|
5
|
+
skipIfNoParametersOrOptions?: boolean;
|
|
6
|
+
wrapper: Addon_StoryWrapper;
|
|
7
|
+
}
|
|
8
|
+
export type MakeDecoratorResult = (...args: any) => any;
|
|
9
|
+
export declare const makeDecorator: ({ name, parameterName, wrapper, skipIfNoParametersOrOptions, }: MakeDecoratorOptions) => MakeDecoratorResult;
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeDecorator = void 0;
|
|
4
|
+
const makeDecorator = ({ name, parameterName, wrapper, skipIfNoParametersOrOptions = false, }) => {
|
|
5
|
+
const decorator = (options) => (storyFn, context) => {
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unnecessary-condition
|
|
7
|
+
const parameters = context.parameters?.[parameterName];
|
|
8
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
9
|
+
if (parameters?.disable) {
|
|
10
|
+
return storyFn(context);
|
|
11
|
+
}
|
|
12
|
+
if (skipIfNoParametersOrOptions && !options && !parameters) {
|
|
13
|
+
return storyFn(context);
|
|
14
|
+
}
|
|
15
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
16
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-assignment
|
|
17
|
+
return wrapper(storyFn, context, { options, parameters });
|
|
18
|
+
};
|
|
19
|
+
return (...args) => {
|
|
20
|
+
// Used without options as .addDecorator(decorator)
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
22
|
+
if (typeof args[0] === 'function') {
|
|
23
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
24
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-argument
|
|
25
|
+
return decorator()(...args);
|
|
26
|
+
}
|
|
27
|
+
return (...innerArgs) => {
|
|
28
|
+
// Used as [.]addDecorator(decorator(options))
|
|
29
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
30
|
+
if (innerArgs.length > 1) {
|
|
31
|
+
// Used as [.]addDecorator(decorator(option1, option2))
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
33
|
+
if (args.length > 1) {
|
|
34
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
36
|
+
return decorator(args)(...innerArgs);
|
|
37
|
+
}
|
|
38
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
39
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
40
|
+
return decorator(...args)(...innerArgs);
|
|
41
|
+
}
|
|
42
|
+
throw new Error(`Passing stories directly into ${name}() is not allowed,
|
|
43
|
+
instead use addDecorator(${name}) and pass options with the '${parameterName}' parameter`);
|
|
44
|
+
};
|
|
45
|
+
};
|
|
46
|
+
};
|
|
47
|
+
exports.makeDecorator = makeDecorator;
|
|
48
|
+
//# sourceMappingURL=makeDecorator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"makeDecorator.js","sourceRoot":"","sources":["../../../src/client/addon/makeDecorator.ts"],"names":[],"mappings":";;;AAaO,MAAM,aAAa,GAAG,CAAC,EAC5B,IAAI,EACJ,aAAa,EACb,OAAO,EACP,2BAA2B,GAAG,KAAK,GACd,EAAuB,EAAE;IAC9C,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC,OAA4B,EAAE,OAA2B,EAAE,EAAE;QACpG,gHAAgH;QAChH,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC;QAEvD,sEAAsE;QACtE,IAAI,UAAU,EAAE,OAAO,EAAE,CAAC;YACxB,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,2BAA2B,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;QAED,qEAAqE;QACrE,wGAAwG;QACxG,OAAO,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC;IAEF,OAAO,CAAC,GAAG,IAAS,EAAE,EAAE;QACtB,mDAAmD;QACnD,sEAAsE;QACtE,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;YAClC,qEAAqE;YACrE,sGAAsG;YACtG,OAAO,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,CAAC,GAAG,SAAc,EAAO,EAAE;YAChC,8CAA8C;YAC9C,sEAAsE;YACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,uDAAuD;gBACvD,sEAAsE;gBACtE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpB,qEAAqE;oBACrE,iEAAiE;oBACjE,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;gBACvC,CAAC;gBACD,qEAAqE;gBACrE,iEAAiE;gBACjE,OAAO,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;YAC1C,CAAC;YAED,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI;mCACV,IAAI,gCAAgC,aAAa,aAAa,CAC1F,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAvDW,QAAA,aAAa,iBAuDxB"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { Renderer } from '@storybook/types';
|
|
2
|
-
import {
|
|
2
|
+
import type { PreviewWeb, StoryStore } from '@storybook/preview-api';
|
|
3
3
|
import { Channel } from '@storybook/channels';
|
|
4
4
|
import { CaptureOptions, StoriesRaw, StorybookGlobals } from '../../types.js';
|
|
5
|
+
import { makeDecorator } from './makeDecorator.js';
|
|
5
6
|
declare global {
|
|
6
7
|
interface Window {
|
|
7
8
|
__CREEVEY_ENV__: boolean;
|
|
@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.withCreevey = withCreevey;
|
|
7
7
|
exports.capture = capture;
|
|
8
|
-
const preview_api_1 = require("@storybook/preview-api");
|
|
9
8
|
const types_js_1 = require("../../types.js");
|
|
10
9
|
const index_js_1 = require("../../shared/index.js");
|
|
11
10
|
const helpers_js_1 = require("../shared/helpers.js");
|
|
12
11
|
const isEqual_js_1 = __importDefault(require("lodash/isEqual.js"));
|
|
12
|
+
const makeDecorator_js_1 = require("./makeDecorator.js");
|
|
13
13
|
const disableAnimationsStyles = `
|
|
14
14
|
*,
|
|
15
15
|
*:hover,
|
|
@@ -230,7 +230,7 @@ function withCreevey() {
|
|
|
230
230
|
window.__CREEVEY_REMOVE_IGNORE_STYLES__ = removeIgnoreStyles;
|
|
231
231
|
window.__CREEVEY_HAS_PLAY_COMPLETED_YET__ = hasPlayCompletedYet;
|
|
232
232
|
window.__CREEVEY_SET_READY_FOR_CAPTURE__ = types_js_1.noop;
|
|
233
|
-
return (0,
|
|
233
|
+
return (0, makeDecorator_js_1.makeDecorator)({
|
|
234
234
|
name: 'withCreevey',
|
|
235
235
|
parameterName: 'creevey',
|
|
236
236
|
wrapper: (getStory, context) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withCreevey.js","sourceRoot":"","sources":["../../../src/client/addon/withCreevey.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"withCreevey.js","sourceRoot":"","sources":["../../../src/client/addon/withCreevey.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,8 @@ class JUnitReporter {
|
|
|
29
29
|
logger;
|
|
30
30
|
suites = {};
|
|
31
31
|
// TODO classnameTemplate
|
|
32
|
+
// TODO Output console logs
|
|
33
|
+
// TODO Output attachments
|
|
32
34
|
constructor(runner, options) {
|
|
33
35
|
const { reportDir, reporterOptions } = options;
|
|
34
36
|
this.reportFile = reporterOptions.outputFile ?? (0, path_1.resolve)(reportDir, 'junit.xml');
|
|
@@ -45,11 +47,11 @@ class JUnitReporter {
|
|
|
45
47
|
this.fileFd = (0, fs_1.openSync)(this.reportFile, 'w+');
|
|
46
48
|
});
|
|
47
49
|
runner.on(types_js_1.TEST_EVENTS.TEST_PASS, (test) => {
|
|
48
|
-
const suite = this.suites[test.parent.title]
|
|
50
|
+
const suite = (this.suites[test.parent.title] ??= []);
|
|
49
51
|
suite.push(test);
|
|
50
52
|
});
|
|
51
53
|
runner.on(types_js_1.TEST_EVENTS.TEST_FAIL, (test) => {
|
|
52
|
-
const suite = this.suites[test.parent.title]
|
|
54
|
+
const suite = (this.suites[test.parent.title] ??= []);
|
|
53
55
|
suite.push(test);
|
|
54
56
|
});
|
|
55
57
|
runner.on(types_js_1.TEST_EVENTS.RUN_END, () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"junit.js","sourceRoot":"","sources":["../../../src/server/reporters/junit.ts"],"names":[],"mappings":";;;AACA,+BAAwC;AACxC,2BAA+E;AAC/E,6CAAuD;AACvD,4CAAsC;AAEtC,8DAA8D;AAC9D,MAAM,cAAc;IAGE;IAFZ,aAAa,GAAG,EAAE,CAAC;IAE3B,YAAoB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;IAAG,CAAC;IAEpD,MAAM;QACJ,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC;IAC/B,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IACjD,CAAC;CACF;AAED,wEAAwE;AACxE,MAAa,aAAa;IAChB,UAAU,CAAS;IACnB,MAAM,CAAU;IAChB,MAAM,CAAuB;IAC7B,MAAM,GAA+B,EAAE,CAAC;IAChD,yBAAyB;IACzB,YAAY,MAAoB,EAAE,OAAwE;QACxG,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAE/C,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,IAAI,IAAA,cAAO,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAEhF,IAAI,CAAC,MAAM,GAAG,IAAI,cAAc,CAAC,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,KAAK,IAAA,aAAQ,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAEhD,IAAA,kBAAa,EAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,sBAAW,CAAC,SAAS,EAAE,GAAG,EAAE;YACpC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;YAEjB,MAAM,eAAe,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE,CAAC;gBACjC,IAAA,cAAS,EAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC;YAED,IAAI,CAAC,MAAM,GAAG,IAAA,aAAQ,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,sBAAW,CAAC,SAAS,EAAE,CAAC,IAAc,EAAE,EAAE;YAClD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"junit.js","sourceRoot":"","sources":["../../../src/server/reporters/junit.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
// NOTE: This file is a modified version of the makeDecorator function from Storybook.
|
|
2
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
|
+
import type { Addon_StoryContext, Addon_LegacyStoryFn, Addon_StoryWrapper } from '@storybook/types';
|
|
4
|
+
|
|
5
|
+
export interface MakeDecoratorOptions {
|
|
6
|
+
name: string;
|
|
7
|
+
parameterName: string;
|
|
8
|
+
skipIfNoParametersOrOptions?: boolean;
|
|
9
|
+
wrapper: Addon_StoryWrapper;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export type MakeDecoratorResult = (...args: any) => any;
|
|
13
|
+
|
|
14
|
+
export const makeDecorator = ({
|
|
15
|
+
name,
|
|
16
|
+
parameterName,
|
|
17
|
+
wrapper,
|
|
18
|
+
skipIfNoParametersOrOptions = false,
|
|
19
|
+
}: MakeDecoratorOptions): MakeDecoratorResult => {
|
|
20
|
+
const decorator = (options?: object) => (storyFn: Addon_LegacyStoryFn, context: Addon_StoryContext) => {
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unnecessary-condition
|
|
22
|
+
const parameters = context.parameters?.[parameterName];
|
|
23
|
+
|
|
24
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
25
|
+
if (parameters?.disable) {
|
|
26
|
+
return storyFn(context);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
if (skipIfNoParametersOrOptions && !options && !parameters) {
|
|
30
|
+
return storyFn(context);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
34
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-assignment
|
|
35
|
+
return wrapper(storyFn, context, { options, parameters });
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
return (...args: any) => {
|
|
39
|
+
// Used without options as .addDecorator(decorator)
|
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
41
|
+
if (typeof args[0] === 'function') {
|
|
42
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-argument
|
|
44
|
+
return decorator()(...args);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return (...innerArgs: any): any => {
|
|
48
|
+
// Used as [.]addDecorator(decorator(options))
|
|
49
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
50
|
+
if (innerArgs.length > 1) {
|
|
51
|
+
// Used as [.]addDecorator(decorator(option1, option2))
|
|
52
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
53
|
+
if (args.length > 1) {
|
|
54
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
55
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
56
|
+
return decorator(args)(...innerArgs);
|
|
57
|
+
}
|
|
58
|
+
// @ts-expect-error - decorator is a function that returns a function
|
|
59
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
60
|
+
return decorator(...args)(...innerArgs);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
throw new Error(
|
|
64
|
+
`Passing stories directly into ${name}() is not allowed,
|
|
65
|
+
instead use addDecorator(${name}) and pass options with the '${parameterName}' parameter`,
|
|
66
|
+
);
|
|
67
|
+
};
|
|
68
|
+
};
|
|
69
|
+
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Renderer, StoryContextForEnhancers } from '@storybook/types';
|
|
2
|
-
import {
|
|
2
|
+
import type { PreviewWeb, StoryStore } from '@storybook/preview-api';
|
|
3
3
|
import { Channel } from '@storybook/channels';
|
|
4
4
|
import {
|
|
5
5
|
CaptureOptions,
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
import { serializeRawStories } from '../../shared/index.js';
|
|
14
14
|
import { getConnectionUrl } from '../shared/helpers.js';
|
|
15
15
|
import isEqual from 'lodash/isEqual.js';
|
|
16
|
+
import { makeDecorator } from './makeDecorator.js';
|
|
16
17
|
|
|
17
18
|
declare global {
|
|
18
19
|
interface Window {
|
|
@@ -30,6 +30,8 @@ export class JUnitReporter {
|
|
|
30
30
|
private logger: IndentedLogger<void>;
|
|
31
31
|
private suites: Record<string, FakeTest[]> = {};
|
|
32
32
|
// TODO classnameTemplate
|
|
33
|
+
// TODO Output console logs
|
|
34
|
+
// TODO Output attachments
|
|
33
35
|
constructor(runner: EventEmitter, options: { reportDir: string; reporterOptions: { outputFile?: string } }) {
|
|
34
36
|
const { reportDir, reporterOptions } = options;
|
|
35
37
|
|
|
@@ -52,11 +54,11 @@ export class JUnitReporter {
|
|
|
52
54
|
this.fileFd = openSync(this.reportFile, 'w+');
|
|
53
55
|
});
|
|
54
56
|
runner.on(TEST_EVENTS.TEST_PASS, (test: FakeTest) => {
|
|
55
|
-
const suite = this.suites[test.parent.title]
|
|
57
|
+
const suite = (this.suites[test.parent.title] ??= []);
|
|
56
58
|
suite.push(test);
|
|
57
59
|
});
|
|
58
60
|
runner.on(TEST_EVENTS.TEST_FAIL, (test: FakeTest) => {
|
|
59
|
-
const suite = this.suites[test.parent.title]
|
|
61
|
+
const suite = (this.suites[test.parent.title] ??= []);
|
|
60
62
|
suite.push(test);
|
|
61
63
|
});
|
|
62
64
|
runner.on(TEST_EVENTS.RUN_END, () => {
|