@storybook/types 7.6.0-alpha.6 → 7.6.0-beta.0

package/dist/index.d.ts

@@ -1064,15 +1064,15 @@ type ArgTypes<TArgs = Args> = {
 type StrictArgTypes<TArgs = Args> = {
     [name in keyof TArgs]: StrictInputType;
 };
-type Globals = {
+interface Globals {
     [name: string]: any;
-};
-type GlobalTypes = {
+}
+interface GlobalTypes {
     [name: string]: InputType;
-};
-type StrictGlobalTypes = {
+}
+interface StrictGlobalTypes {
     [name: string]: StrictInputType;
-};
+}
 type Renderer = {
     /** What is the type of the `component` annotation in this renderer? */
     component: unknown;
@@ -1082,7 +1082,7 @@ type Renderer = {
     canvasElement: unknown;
     T?: unknown;
 };
-type StoryContextForEnhancers<TRenderer extends Renderer = Renderer, TArgs = Args> = StoryIdentifier & {
+interface StoryContextForEnhancers<TRenderer extends Renderer = Renderer, TArgs = Args> extends StoryIdentifier {
     component?: (TRenderer & {
         T: any;
     })['component'];
@@ -1092,28 +1092,28 @@ type StoryContextForEnhancers<TRenderer extends Renderer = Renderer, TArgs = Arg
     parameters: Parameters;
     initialArgs: TArgs;
     argTypes: StrictArgTypes<TArgs>;
-};
+}
 type ArgsEnhancer<TRenderer extends Renderer = Renderer, TArgs = Args> = (context: StoryContextForEnhancers<TRenderer, TArgs>) => TArgs;
 type ArgTypesEnhancer<TRenderer extends Renderer = Renderer, TArgs = Args> = ((context: StoryContextForEnhancers<TRenderer, TArgs>) => StrictArgTypes<TArgs>) & {
     secondPass?: boolean;
 };
-type StoryContextUpdate<TArgs = Args> = {
+interface StoryContextUpdate<TArgs = Args> {
     args?: TArgs;
     globals?: Globals;
     [key: string]: any;
-};
+}
 type ViewMode$1 = 'story' | 'docs';
-type StoryContextForLoaders<TRenderer extends Renderer = Renderer, TArgs = Args> = StoryContextForEnhancers<TRenderer, TArgs> & Required<StoryContextUpdate<TArgs>> & {
+interface StoryContextForLoaders<TRenderer extends Renderer = Renderer, TArgs = Args> extends StoryContextForEnhancers<TRenderer, TArgs>, Required<StoryContextUpdate<TArgs>> {
     hooks: unknown;
     viewMode: ViewMode$1;
     originalStoryFn: StoryFn<TRenderer>;
-};
-type LoaderFunction<TRenderer extends Renderer = Renderer, TArgs = Args> = (context: StoryContextForLoaders<TRenderer, TArgs>) => Promise<Record<string, any>>;
-type StoryContext<TRenderer extends Renderer = Renderer, TArgs = Args> = StoryContextForLoaders<TRenderer, TArgs> & {
+}
+type LoaderFunction<TRenderer extends Renderer = Renderer, TArgs = Args> = (context: StoryContextForLoaders<TRenderer, TArgs>) => Promise<Record<string, any> | void> | Record<string, any> | void;
+interface StoryContext<TRenderer extends Renderer = Renderer, TArgs = Args> extends StoryContextForLoaders<TRenderer, TArgs> {
     loaded: Record<string, any>;
     abortSignal: AbortSignal;
     canvasElement: TRenderer['canvasElement'];
-};
+}
 type StepLabel = string;
 type StepFunction<TRenderer extends Renderer = Renderer, TArgs = Args> = (label: StepLabel, play: PlayFunction<TRenderer, TArgs>) => Promise<void> | void;
 type PlayFunctionContext<TRenderer extends Renderer = Renderer, TArgs = Args> = StoryContext<TRenderer, TArgs> & {
@@ -1136,7 +1136,7 @@ type BaseAnnotations<TRenderer extends Renderer = Renderer, TArgs = Args> = {
      * Decorators defined in Meta will be applied to every story variation.
      * @see [Decorators](https://storybook.js.org/docs/addons/introduction/#1-decorators)
      */
-    decorators?: DecoratorFunction<TRenderer, Simplify<TArgs>>[];
+    decorators?: DecoratorFunction<TRenderer, Simplify<TArgs>>[] | DecoratorFunction<TRenderer, Simplify<TArgs>>;
     /**
      * Custom metadata for a story.
      * @see [Parameters](https://storybook.js.org/docs/basics/writing-stories/#parameters)
@@ -1156,7 +1156,7 @@ type BaseAnnotations<TRenderer extends Renderer = Renderer, TArgs = Args> = {
      * Asynchronous functions which provide data for a story.
      * @see [Loaders](https://storybook.js.org/docs/react/writing-stories/loaders)
      */
-    loaders?: LoaderFunction<TRenderer, TArgs>[];
+    loaders?: LoaderFunction<TRenderer, TArgs>[] | LoaderFunction<TRenderer, TArgs>;
     /**
      * Define a custom render function for the story(ies). If not passed, a default render function by the renderer will be used.
      */
@@ -1277,8 +1277,8 @@ type AnnotatedStoryFn<TRenderer extends Renderer = Renderer, TArgs = Args> = Arg
 type StoryAnnotationsOrFn<TRenderer extends Renderer = Renderer, TArgs = Args> = AnnotatedStoryFn<TRenderer, TArgs> | StoryAnnotations<TRenderer, TArgs>;
 type ArgsFromMeta<TRenderer extends Renderer, Meta> = Meta extends {
     render?: ArgsStoryFn<TRenderer, infer RArgs>;
-    loaders?: (infer Loaders)[];
-    decorators?: (infer Decorators)[];
+    loaders?: (infer Loaders)[] | infer Loaders;
+    decorators?: (infer Decorators)[] | infer Decorators;
 } ? Simplify<RemoveIndexSignature<RArgs & DecoratorsArgs<TRenderer, Decorators> & LoaderArgs<TRenderer, Loaders>>> : unknown;
 type DecoratorsArgs<TRenderer extends Renderer, Decorators> = UnionToIntersection<Decorators extends DecoratorFunction<TRenderer, infer TArgs> ? TArgs : unknown>;
 type LoaderArgs<TRenderer extends Renderer, Loaders> = UnionToIntersection<Loaders extends LoaderFunction<TRenderer, infer TArgs> ? TArgs : unknown>;
@@ -3704,8 +3704,15 @@ interface TypescriptOptions {
      * Disable parsing typescript files through babel.
      *
      * @default `false`
+     * @deprecated use `skipCompiler` instead
      */
     skipBabel: boolean;
+    /**
+     * Disable parsing typescript files through compiler.
+     *
+     * @default `false`
+     */
+    skipCompiler: boolean;
 }
 type Preset = string | {
     name: string;
@@ -3825,6 +3832,12 @@ interface StorybookConfig {
          * Apply decorators from preview.js before decorators from addons or frameworks
          */
         legacyDecoratorFileOrder?: boolean;
+        /**
+         * Disallow implicit actions during rendering. This will be the default in Storybook 8.
+         *
+         * This will make sure that your story renders the same no matter if docgen is enabled or not.
+         */
+        disallowImplicitActionsInRenderV8?: boolean;
     };
     build?: TestBuildConfig;
     /**
@@ -4743,21 +4756,27 @@ type ProjectAnnotations<TRenderer extends Renderer> = ProjectAnnotations$1<TRend
     renderToCanvas?: RenderToCanvas<TRenderer>;
     renderToDOM?: RenderToCanvas<TRenderer>;
 };
-type NormalizedProjectAnnotations<TRenderer extends Renderer = Renderer> = ProjectAnnotations<TRenderer> & {
+type NormalizedProjectAnnotations<TRenderer extends Renderer = Renderer> = Omit<ProjectAnnotations<TRenderer>, 'decorators' | 'loaders'> & {
     argTypes?: StrictArgTypes;
     globalTypes?: StrictGlobalTypes;
+    decorators?: DecoratorFunction<TRenderer>[];
+    loaders?: LoaderFunction<TRenderer>[];
 };
-type NormalizedComponentAnnotations<TRenderer extends Renderer = Renderer> = ComponentAnnotations<TRenderer> & {
+type NormalizedComponentAnnotations<TRenderer extends Renderer = Renderer> = Omit<ComponentAnnotations<TRenderer>, 'decorators' | 'loaders'> & {
     id: ComponentId;
     title: ComponentTitle;
     argTypes?: StrictArgTypes;
+    decorators?: DecoratorFunction<TRenderer>[];
+    loaders?: LoaderFunction<TRenderer>[];
 };
-type NormalizedStoryAnnotations<TRenderer extends Renderer = Renderer> = Omit<StoryAnnotations<TRenderer>, 'storyName' | 'story'> & {
+type NormalizedStoryAnnotations<TRenderer extends Renderer = Renderer> = Omit<StoryAnnotations<TRenderer>, 'storyName' | 'story' | 'decorators' | 'loaders'> & {
     moduleExport: ModuleExport;
     id: StoryId;
     argTypes?: StrictArgTypes;
     name: StoryName;
     userStoryFn?: StoryFn<TRenderer>;
+    decorators?: DecoratorFunction<TRenderer>[];
+    loaders?: LoaderFunction<TRenderer>[];
 };
 type CSFFile<TRenderer extends Renderer = Renderer> = {
     meta: NormalizedComponentAnnotations<TRenderer>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/types",
-  "version": "7.6.0-alpha.6",
+  "version": "7.6.0-beta.0",
   "description": "Core Storybook TS Types",
   "keywords": [
     "storybook"
@@ -40,17 +40,17 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "../../../scripts/prepare/check.ts",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "check": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/check.ts",
+    "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/channels": "7.6.0-alpha.6",
+    "@storybook/channels": "7.6.0-beta.0",
     "@types/babel__core": "^7.0.0",
     "@types/express": "^4.7.0",
     "file-system-cache": "2.3.0"
   },
   "devDependencies": {
-    "@storybook/csf": "^0.1.0",
+    "@storybook/csf": "^0.1.2",
     "@types/fs-extra": "^11.0.1",
     "@types/node": "^18.0.0",
     "typescript": "~4.9.3"